svn commit: r1187528 - /ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl

Author: jleroux
Date: Fri Oct 21 19:46:32 2011
New Revision: 1187528

URL: http://svn.apache.org/viewvc?rev=1187528&view=rev
Log:
A patch from Varun Bhansaly https://issues.apache.org/jira/browse/OFBIZ-4500
"Promo condition - Shipping method gets lost."

Steps to replicate -
1. Create a promo rule having condition with Shipping Total in LHS, an(y) operator, some value in RHS and some value in "Select Shipping Method". Click create.
2. Try updating RHS value, notice value for "Select Shipping Method" get lost.

Modified:
    ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl

Modified: ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl?rev=1187528&r1=1187527&r2=1187528&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl Fri Oct 21 19:46:32 2011
@@ -119,7 +119,7 @@ under the License.
       </#if>
                   <label>${uiLabelMap.OrderSelectShippingMethod}:</label>
                   <select name = "carrierShipmentMethod">
-                    <option value = "${productPromoCond.carrierShippingMethod?if_exists}">${carrierParty?if_exists}&nbsp;${description}</option>
+                    <option value = "${carrierShippingMethod?if_exists}">${carrierParty?if_exists}&nbsp;${description}</option>
                     <option value = "">&nbsp;</option>
       <#list carrierShipmentMethods as carrierShipmentMethod>
         <#assign shipmentMethodType = carrierShipmentMethod.getRelatedOneCache("ShipmentMethodType")>