You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mr...@apache.org on 2008/08/11 07:49:48 UTC
svn commit: r684640 - in /ofbiz/trunk/specialpurpose/ebay:
webapp/ebay/WEB-INF/actions/find/ProductsExportToEbay.groovy
webapp/ebay/WEB-INF/actions/find/productsExportToEbay.bsh
widget/EbayScreens.xml
Author: mrisaliti
Date: Sun Aug 10 22:49:47 2008
New Revision: 684640
URL: http://svn.apache.org/viewvc?rev=684640&view=rev
Log:
Same changes to eBay application after that some groovy files has been converted.
Added:
ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/find/ProductsExportToEbay.groovy
- copied, changed from r684314, ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/find/productsExportToEbay.bsh
Removed:
ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/find/productsExportToEbay.bsh
Modified:
ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml
Copied: ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/find/ProductsExportToEbay.groovy (from r684314, ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/find/productsExportToEbay.bsh)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/find/ProductsExportToEbay.groovy?p2=ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/find/ProductsExportToEbay.groovy&p1=ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/find/productsExportToEbay.bsh&r1=684314&r2=684640&rev=684640&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/find/productsExportToEbay.bsh (original)
+++ ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/actions/find/ProductsExportToEbay.groovy Sun Aug 10 22:49:47 2008
@@ -17,14 +17,11 @@
* under the License.
*/
-import org.ofbiz.base.util.*;
-import javolution.util.FastList;
+categoryCode = parameters.categoryCode;
+userLogin = parameters.userLogin;
-categoryCode = parameters.get("categoryCode");
-userLogin = parameters.get("userLogin");
+results = dispatcher.runSync("getEbayCategories", [categoryCode : categoryCode, userLogin : userLogin]);
-results = dispatcher.runSync("getEbayCategories", UtilMisc.toMap("categoryCode", categoryCode, "userLogin", userLogin));
-
-if (results.get("categories") != null) {
- context.put("categories", results.get("categories"));
+if (results.categories) {
+ context.categories = results.categories;
}
\ No newline at end of file
Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml?rev=684640&r1=684639&r2=684640&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml Sun Aug 10 22:49:47 2008
@@ -45,9 +45,9 @@
<actions>
<property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
- <set field="productId" from-field="parameters.productId"/>
+ <set field="productId" from-field="parameters.productId"/>
<entity-one entity-name="Product" value-name="product"/>
- <set field="productName" from-field="product.productName"/>
+ <set field="productName" from-field="product.productName"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -84,7 +84,7 @@
<fail-widgets>
<label style="h3">${uiLabelMap.ProductCatalogViewPermissionError}</label>
</fail-widgets>
- </section>
+ </section>
</decorator-section>
</decorator-screen>
</widgets>
@@ -108,7 +108,7 @@
<fail-widgets>
<label style="h3">${uiLabelMap.EbayViewPermissionError}</label>
</fail-widgets>
- </section>
+ </section>
</decorator-section>
</decorator-screen>
</widgets>
@@ -146,7 +146,7 @@
<actions>
<set field="titleProperty" value="PageTitleSearchResults"/>
<set field="headerItem" value="export"/>
- <script location="component://product/webapp/catalog/WEB-INF/actions/find/keywordsearch.bsh"/>
+ <script location="component://product/webapp/catalog/WEB-INF/actions/find/keywordsearch.groovy"/>
</actions>
<widgets>
<decorator-screen name="permission-decorator">
@@ -173,7 +173,7 @@
<condition-expr field-name="geoTypeId" value="COUNTRY"/>
<order-by field-name="geoName"/>
</entity-condition>
- <script location="component://ebay/webapp/ebay/WEB-INF/actions/find/productsExportToEbay.bsh"/>
+ <script location="component://ebay/webapp/ebay/WEB-INF/actions/find/ProductsExportToEbay.groovy"/>
</actions>
<widgets>
<decorator-screen name="permission-decorator">
@@ -199,7 +199,7 @@
</decorator-section>
</decorator-screen>
</widgets>
- </section>
+ </section>
</screen>
<screen name="ManageOrdersFromEbay">
@@ -220,7 +220,7 @@
</container>
<container style="screenlet-body">
<section>
- <widgets>
+ <widgets>
<include-form name="ManageOrdersFromEbay" location="component://ebay/widget/EbayForms.xml"/>
</widgets>
</section>
@@ -234,7 +234,7 @@
</container>
<container style="screenlet-body">
<section>
- <widgets>
+ <widgets>
<include-form name="ListOrdersFromEbay" location="component://ebay/widget/EbayForms.xml"/>
</widgets>
</section>
@@ -272,7 +272,7 @@
</widgets>
</section>
</container>
- </container>
+ </container>
<!-- include the duplicate product form template -->
<container style="screenlet">
<container style="screenlet-title-bar">
@@ -280,7 +280,7 @@
<label text="${uiLabelMap.ProductDuplicateProduct}"/>
</container>
</container>
- <container style="screenlet-body">
+ <container style="screenlet-body">
<include-form name="EditProductDup" location="component://product/webapp/catalog/product/ProductForms.xml"/>
</container>
</container>