svn commit: r1094281 - in /ofbiz/trunk/specialpurpose: ebay/widget/EbayForms.xml ebaystore/data/DemoEbayStoreData.xml

Author: jleroux
Date: Mon Apr 18 06:55:29 2011
New Revision: 1094281

URL: http://svn.apache.org/viewvc?rev=1094281&view=rev
Log:
A patch from Ankit Jain  "Some misc issues in ebay and ebayStore component."(https://issues.apache.org/jira/browse/OFBIZ-4118


On the Ebay Configuration search page (https://localhost:8443/ebaystore/control/FindEbayConfigurations) a default value "EBAY_STORE" is shown selected and after search the same value is shown instead of the value we selected before clicking on find and same case on on Edit Ebay Configuration page (https://localhost:8443/ebaystore/control/EditEbayConfiguration?productStoreId=9000).

The attached patch fixed this problem also fixed the website data.

Modified:
    ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml
    ofbiz/trunk/specialpurpose/ebaystore/data/DemoEbayStoreData.xml

Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml?rev=1094281&r1=1094280&r2=1094281&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml Mon Apr 18 06:55:29 2011
@@ -177,10 +177,10 @@ under the License.
         <field name="xmlGatewayUri"><text size="40"/></field>
         <field name="apiServerUrl"><text size="40"/></field>
         <field name="customXml"><textarea cols="60" rows="5"/></field>
-        <field name="webSiteId" title="${uiLabelMap.ProductWebSite}">
-            <drop-down>
+        <field name="websiteId" field-name="webSiteId" parameter-name="webSiteId" title="${uiLabelMap.ProductWebSite}">
+            <drop-down no-current-selected-key="${ebayConfig.webSiteId}">
                 <option key="" description="- ${uiLabelMap.CommonSelectAny} -"/>
-                <entity-options description="${siteName}" entity-name="WebSite">
+                <entity-options description="${siteName}" entity-name="WebSite" key-field-name="webSiteId">
                     <entity-order-by field-name="siteName"/>
                 </entity-options>
             </drop-down>
@@ -259,10 +259,10 @@ under the License.
                 </entity-options>
             </drop-down>
         </field>
-        <field name="webSiteId" title="${uiLabelMap.ProductWebSite}">
-            <drop-down>
+        <field name="websiteId" field-name="webSiteId" parameter-name="webSiteId" title="${uiLabelMap.ProductWebSite}">
+            <drop-down no-current-selected-key="${parameters.webSiteId}">
                 <option key="" description="- ${uiLabelMap.CommonSelectAny} -"/>
-                <entity-options entity-name="WebSite" description="${siteName} [${webSiteId}]">
+                <entity-options entity-name="WebSite" description="${siteName} [${webSiteId}]" key-field-name="webSiteId">
                     <entity-order-by field-name="siteName"/>
                 </entity-options>
             </drop-down>

Modified: ofbiz/trunk/specialpurpose/ebaystore/data/DemoEbayStoreData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/data/DemoEbayStoreData.xml?rev=1094281&r1=1094280&r2=1094281&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/data/DemoEbayStoreData.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/data/DemoEbayStoreData.xml Mon Apr 18 06:55:29 2011
@@ -123,7 +123,7 @@
     <ProductStoreCatalog productStoreId="90102" prodCatalogId="eBayCatalog" fromDate="2010-01-01 16:19:47.058"/>
     <ProductStoreFacility productStoreId="90102" facilityId="WebStoreWarehouse" fromDate="2010-01-01 16:19:47.058"/>
 
-    <WebSite webSiteId="EBAY_STORE2" siteName="eBay Store1" standardContentPrefix="http://demo.ofbiz.org" productStoreId="90102"/>
+    <WebSite webSiteId="EBAY_STORE2" siteName="eBay Store2" standardContentPrefix="http://demo.ofbiz.org" productStoreId="90102"/>
     <EbayConfig productStoreId="90102" devId="63655096-de90-4e82-bae4-67566f15bf53" appId="Company0-9f43-4ad4-96f7-19753fbc4e8d" certId="57a28c38-d491-4236-b702-a87e1d10e9a2" compatibilityLevel="643" siteId="0" xmlGatewayUri="https://api.sandbox.ebay.com/ws/api.dll"  apiServerUrl="https://api.sandbox.ebay.com/wsapi"  webSiteId="EBAY_STORE2">
         <token><![CDATA[AgAAAA**AQAAAA**aAAAAA**xaa5Sw**nY+sHZ2PrBmdj6wVnY+sEZ2PrA2dj6wFk4CoAJGCqA6dj6x9nY+seQ**QkwBAA**AAMAAA**Gw+sbEXV/KlY0mtzVtkoyvyI/cqJTPLFljiknR9nqxJIB+lxOif0atqUMsOFqTz8Kvqc7F3Ri7JK5jPOaNyxW0+MKeKMoOcWTUTav4kmvTdeqdVLUi6kAtttD6uK/kRN1CyBqe3e9xd7GLLPedOyrtoB0j7mS1sMyu2uPCyeY/QROIxR8ljRSjmcGUco1STOmZ0bqlEudZ+FBKjLxigbnY15I2m09lEOMfmCIIs02im2wp+EPcin72wMMo+RP++Dfl/pL1tYntCEimHJilAtJsAarSUTyXbOwEqG47/jX2u+XXXjF3xlcAwP/i/P4G+qf4NbWOlZY2BrNuOZJw4PRYPMuBgfcAUnHnS7aw/eXlJ0FCCJVgSIwJdTXbQCI5SjluFWGHvC7zsCgqV0AzT6VozlY//2wJTX4RL/b5+O04DkVUtce0/bhkzXPssEOUaVKka97+89zhwuGPjTqBO8+HnAxHVMrKZPcxn2brU4zIi4K7D94zPTfOQfYfRuPmvpsTojmBgLqYABXAOStKKGzT+4EJ0m6qPVV7/frzwTmNj28+SfJOy1LgnvRKMu6+tv6ZBxGbK4aAjot/MV+8arhYEuq0U2x/laCJhfuYAKGW+AZHCDVEhEMGN6VOgHe6X0qymiQKwZaWM3VztThnczYp9GFmiEwlJqtRJvHxVdyVrvWaUxgF4eIQzHAaVjLmXT/3szBapbuO52Q7z/wdjez1rLraqqKDXJsJxuwLIUNuXGkLOgkIYUNTFGcix0u0yJ]]></token>
         <customXml><![CDATA[<custom-xml><Currency>USD</Currency><UseTaxTable>false</UseTaxTable><DispatchTimeMax>3</DispatchTimeMax><ReturnPolicy><ReturnsAcceptedOption>ReturnsNotAccepted</ReturnsAcceptedOption></ReturnPolicy><ShippingDetails><ShippingType>Flat</ShippingType><ShippingServiceOptions><ShippingService>UPS2ndDay</ShippingService><ShippingServicePriority>1</ShippingServicePriority><ShippingServiceCost>5</ShippingServiceCost><ShippingServiceAdditionalCost>2</ShippingServiceAdditionalCost><ShippingSurcharge>1</ShippingSurcharge></ShippingServiceOptions></ShippingDetails></custom-xml>]]></customXml>