svn commit: r818720 - in /ofbiz/trunk/specialpurpose/ebay: webapp/ebay/WEB-INF/actions/find/ProductsExportToEbay.groovy widget/EbayForms.xml

[ashish-18]

Author: ashish
Date: Fri Sep 25 05:23:54 2009
New Revision: 818720

URL: http://svn.apache.org/viewvc?rev=818720&view=rev
Log:
Navigated OrderId link to OrderMgr component.
Also removed default values for productStoreId and webSiteUrl.


Modified:
    ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/find/ProductsExportToEbay.groovy
    ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml

Modified: ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/find/ProductsExportToEbay.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/find/ProductsExportToEbay.groovy?rev=818720&r1=818719&r2=818720&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/find/ProductsExportToEbay.groovy (original)
+++ ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/find/ProductsExportToEbay.groovy Fri Sep 25 05:23:54 2009
@@ -19,31 +19,33 @@
 import org.ofbiz.webapp.website.WebSiteWorker;
 
 webSite = WebSiteWorker.getWebSite(request);
-productStoreId = "9000"; // provide the default value
+productStoreId = null;
 if (webSite) {
     productStoreId = webSite.productStoreId;
     context.productStoreId = productStoreId;
     eBayConfig = delegator.findOne("EbayConfig", [productStoreId : productStoreId], false);
     context.customXml = eBayConfig.customXml;
-    context.webSiteUrl = webSite.getString("standardContentPrefix")?:"http://demo.ofbiz.org";
-}
-
-categoryCode = parameters.categoryCode;
-context.categoryCode = categoryCode;
-userLogin = parameters.userLogin;
-
-results = dispatcher.runSync("getEbayCategories", [categoryCode : categoryCode, userLogin : userLogin, productStoreId : productStoreId]);
-
-if (results.categories) {
-    context.categories = results.categories;
-}
-
-if (categoryCode) {
-    if (!"Y".equals(categoryCode.substring(0, 1)) && !"".equals(categoryCode)) {
-        context.hideExportOptions = "Y";
+    context.webSiteUrl = webSite.getString("standardContentPrefix");
+    
+    categoryCode = parameters.categoryCode;
+    context.categoryCode = categoryCode;
+    userLogin = parameters.userLogin;
+    
+    if (productStoreId) {
+        results = dispatcher.runSync("getEbayCategories", [categoryCode : categoryCode, userLogin : userLogin, productStoreId : productStoreId]);
+    }
+    
+    if (results.categories) {
+        context.categories = results.categories;
+    }
+    
+    if (categoryCode) {
+        if (!"Y".equals(categoryCode.substring(0, 1)) && !"".equals(categoryCode)) {
+            context.hideExportOptions = "Y";
+        } else {
+            context.hideExportOptions = "N";
+        }
     } else {
         context.hideExportOptions = "N";
-    }
-} else {
-    context.hideExportOptions = "N";
-}
\ No newline at end of file
+    }    
+}

Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml?rev=818720&r1=818719&r2=818720&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml Fri Sep 25 05:23:54 2009
@@ -113,7 +113,7 @@
        <field name="externalId" title="${uiLabelMap.EbayEbayOrderIdOrTransactionId}" use-when="${isEbayOrder}" tooltip="eBay Order"><display/></field>
        <field name="externalId" title="${uiLabelMap.EbayEbayOrderIdOrTransactionId}" use-when="${isEbayTransaction}" tooltip="eBay Transaction"><display/></field>
         <field name="orderId">
-            <hyperlink target="orderview" description="${orderId}">
+            <hyperlink target="/ordermgr/control/orderview" also-hidden="false" description="${orderId}" target-type="inter-app">
                 <parameter param-name="orderId"/>
             </hyperlink>
         </field>