You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by pr...@apache.org on 2016/05/21 11:18:19 UTC
svn commit: r1744904 -
/ofbiz/trunk/applications/product/template/promo/EditProductPromoRules.ftl
Author: pranayp
Date: Sat May 21 11:18:19 2016
New Revision: 1744904
URL: http://svn.apache.org/viewvc?rev=1744904&view=rev
Log:
[OFBIZ-7091] Applied patch from the ticket for improvement on Edit Promo Screen where two empty options were being shown in shipping method select box.
Thanks Swapnil M Mane for the contribution.
Modified:
ofbiz/trunk/applications/product/template/promo/EditProductPromoRules.ftl
Modified: ofbiz/trunk/applications/product/template/promo/EditProductPromoRules.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/promo/EditProductPromoRules.ftl?rev=1744904&r1=1744903&r2=1744904&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/template/promo/EditProductPromoRules.ftl (original)
+++ ofbiz/trunk/applications/product/template/promo/EditProductPromoRules.ftl Sat May 21 11:18:19 2016
@@ -123,7 +123,9 @@ under the License.
</#if>
<label>${uiLabelMap.OrderSelectShippingMethod}:</label>
<select name = "carrierShipmentMethod">
- <option value = "${carrierShippingMethod!}">${carrierParty!} ${description}</option>
+ <#if carrierShippingMethod?has_content>
+ <option value = "${carrierShippingMethod!}">${carrierParty!} ${description}</option>
+ </#if>
<option value = ""> </option>
<#list carrierShipmentMethods as carrierShipmentMethod>
<#assign shipmentMethodType = carrierShipmentMethod.getRelatedOne("ShipmentMethodType", true)>