OFBiz › OFBiz - Commits

svn commit: r643975 - in /ofbiz/trunk/applications/product: webapp/catalog/WEB-INF/actions/product/EditProductAssoc.bsh widget/catalog/ProductScreens.xml

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

jonesde

svn commit: r643975 - in /ofbiz/trunk/applications/product: webapp/catalog/WEB-INF/actions/product/EditProductAssoc.bsh widget/catalog/ProductScreens.xml

Author: jonesde
Date: Wed Apr 2 10:02:58 2008
New Revision: 643975

URL: http://svn.apache.org/viewvc?rev=643975&view=rev
Log:
Some cleanups; quite a few more could be done as there are some funny patterns in there, and old things still

Modified:
ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductAssoc.bsh
ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml

Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductAssoc.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductAssoc.bsh?rev=643975&r1=643974&r2=643975&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductAssoc.bsh (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductAssoc.bsh Wed Apr 2 10:02:58 2008
@@ -33,17 +33,17 @@
boolean useValues = true;
if (request.getAttribute("_ERROR_MESSAGE_") != null) useValues = false;

-productId = request.getParameter("productId");
-if (productId == null) productId = request.getParameter("PRODUCT_ID");
+productId = parameters.get("productId");
+if (productId == null) productId = parameters.get("PRODUCT_ID");
if (productId != null) context.put("productId", productId);

-productIdTo = request.getParameter("PRODUCT_ID_TO");
+productIdTo = parameters.get("PRODUCT_ID_TO");
if (productIdTo != null) context.put("productIdTo", productIdTo);

-productAssocTypeId = request.getParameter("PRODUCT_ASSOC_TYPE_ID");
+productAssocTypeId = parameters.get("PRODUCT_ASSOC_TYPE_ID");
if (productAssocTypeId != null) context.put("productAssocTypeId", productAssocTypeId);

-fromDateStr = request.getParameter("FROM_DATE");
+fromDateStr = parameters.get("FROM_DATE");

Timestamp fromDate = null;
if (UtilValidate.isNotEmpty(fromDateStr)) fromDate = Timestamp.valueOf(fromDateStr);
@@ -56,7 +56,7 @@
productAssoc = delegator.findByPrimaryKey("ProductAssoc", UtilMisc.toMap("productId", productId, "productIdTo", productIdTo, "productAssocTypeId", productAssocTypeId, "fromDate", fromDate));
if (productAssoc != null) context.put("productAssoc", productAssoc);

-if("true".equalsIgnoreCase((String)request.getParameter("useValues"))) useValues = true;
+if("true".equalsIgnoreCase(parameters.get("useValues"))) useValues = true;
if(productAssoc == null) useValues = false;

context.put("useValues", useValues);

Modified: ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml?rev=643975&r1=643974&r2=643975&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml Wed Apr 2 10:02:58 2008
@@ -1549,11 +1549,7 @@
</container>
</container>
<container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AddProductMaint" location="component://product/webapp/catalog/product/ProductForms.xml"/>
- </widgets>
- </section>
+ <include-form name="AddProductMaint" location="component://product/webapp/catalog/product/ProductForms.xml"/>
</container>
</container>
</decorator-section>
@@ -1579,11 +1575,7 @@
</container>
</container>
<container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListProductMeters" location="component://product/webapp/catalog/product/ProductForms.xml"/>
- </widgets>
- </section>
+ <include-form name="ListProductMeters" location="component://product/webapp/catalog/product/ProductForms.xml"/>
</container>
</container>
<container style="screenlet">
@@ -1593,11 +1585,7 @@
</container>
</container>
<container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AddProductMeter" location="component://product/webapp/catalog/product/ProductForms.xml"/>
- </widgets>
- </section>
+ <include-form name="AddProductMeter" location="component://product/webapp/catalog/product/ProductForms.xml"/>
</container>
</container>
</decorator-section>
@@ -1623,11 +1611,7 @@
</container>
</container>
<container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListProductGeos" location="component://product/webapp/catalog/product/ProductForms.xml"/>
- </widgets>
- </section>
+ <include-form name="ListProductGeos" location="component://product/webapp/catalog/product/ProductForms.xml"/>
</container>
</container>
<container style="screenlet">
@@ -1637,11 +1621,7 @@
</container>
</container>
<container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AddProductGeo" location="component://product/webapp/catalog/product/ProductForms.xml"/>
- </widgets>
- </section>
+ <include-form name="AddProductGeo" location="component://product/webapp/catalog/product/ProductForms.xml"/>
</container>
</container>
</decorator-section>
@@ -1668,11 +1648,7 @@
</container>
</container>
<container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListProductSubscriptionResources" location="component://product/webapp/catalog/product/ProductForms.xml"/>
- </widgets>
- </section>
+ <include-form name="ListProductSubscriptionResources" location="component://product/webapp/catalog/product/ProductForms.xml"/>
</container>
</container>
<container style="screenlet">
@@ -1682,11 +1658,7 @@
</container>
</container>
<container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AddProductSubscriptionResource" location="component://product/webapp/catalog/product/ProductForms.xml"/>
- </widgets>
- </section>
+ <include-form name="AddProductSubscriptionResource" location="component://product/webapp/catalog/product/ProductForms.xml"/>
</container>
</container>
</decorator-section>
@@ -1713,11 +1685,7 @@
</container>
</container>
<container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListProductWorkEfforts" location="component://product/webapp/catalog/product/ProductForms.xml"/>
- </widgets>
- </section>
+ <include-form name="ListProductWorkEfforts" location="component://product/webapp/catalog/product/ProductForms.xml"/>
</container>
</container>
<container style="screenlet">
@@ -1727,11 +1695,7 @@
</container>
</container>
<container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AddProductWorkEffort" location="component://product/webapp/catalog/product/ProductForms.xml"/>
- </widgets>
- </section>
+ <include-form name="AddProductWorkEffort" location="component://product/webapp/catalog/product/ProductForms.xml"/>
</container>
</container>
</decorator-section>
@@ -1784,18 +1748,12 @@
<decorator-section name="body">
<container style="screenlet">
<container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditProductParties}"/>
- </container>
+ <label text="${uiLabelMap.PageTitleEditProductParties}" style="h3"/>
</container>
<container style="screenlet-body">
- <section>
- <widgets>
- <platform-specific>
- <html><html-template location="component://product/webapp/catalog/product/EditProductParties.ftl"/></html>
- </platform-specific>
- </widgets>
- </section>
+ <platform-specific>
+ <html><html-template location="component://product/webapp/catalog/product/EditProductParties.ftl"/></html>
+ </platform-specific>
</container>
</container>
</decorator-section>
@@ -1821,30 +1779,18 @@
<decorator-section name="body">
<container style="screenlet">
<container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditVendorProduct}"/>
- </container>
+ <label text="${uiLabelMap.PageTitleEditVendorProduct}" style="h3"/>
</container>
<container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListVendorProducts" location="component://product/webapp/catalog/product/ProductForms.xml"/>
- </widgets>
- </section>
+ <include-form name="ListVendorProducts" location="component://product/webapp/catalog/product/ProductForms.xml"/>
</container>
</container>
<container style="screenlet">
<container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleAddVendorProduct}"/>
- </container>
+ <label text="${uiLabelMap.PageTitleAddVendorProduct}" style="h3"/>
</container>
<container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="EditVendorProduct" location="component://product/webapp/catalog/product/ProductForms.xml"/>
- </widgets>
- </section>
+ <include-form name="EditVendorProduct" location="component://product/webapp/catalog/product/ProductForms.xml"/>
</container>
</container>
</decorator-section>
@@ -1852,5 +1798,4 @@
</widgets>
</section>
</screen>
-
</screens>