ofbiz-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jler...@apache.org
Subject svn commit: r487654 - /incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
Date Fri, 15 Dec 2006 20:36:45 GMT
Author: jleroux
Date: Fri Dec 15 12:36:44 2006
New Revision: 487654

URL: http://svn.apache.org/viewvc?view=rev&rev=487654
Log:
A patch from Chris Howe "orderview dropdown of destination addresses sometimes doesn't show
information as text in dropdown" (https://issues.apache.org/jira/browse/OFBIZ-367).
 	  	 

Modified:
    incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl

Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?view=diff&rev=487654&r1=487653&r2=487654
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Fri
Dec 15 12:36:44 2006
@@ -40,14 +40,16 @@
               <div class="tabletext">
               <#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED"
&& orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_REJECTED">
           
                  <select name="contactMechId" class="selectBox">
-                   <option value="${shipGroup.contactMechId?if_exists}">${(shipGroupAddress.address1)?default("")}
- ${shipGroupAddress.city?default("")}</option>
-                    <option value="${shipGroup.contactMechId?if_exists}"></option>
-                    <#list shippingContactMechList as shippingContactMech>
-                    <#assign shippingPostalAddress = shippingContactMech.getRelatedOne("PostalAddress")?if_exists>
-                       <#if shippingContactMech.contactMechId?has_content>
-                       <option value="${shippingContactMech.contactMechId?if_exists}">${(shippingPostalAddress.address1)?default("")}
- ${shippingPostalAddress.city?default("")}</option>
-                       </#if>
-                    </#list>
+                    <option SELECTED value="${shipGroup.contactMechId?if_exists}">${(shipGroupAddress.address1)?default("")}
- ${shipGroupAddress.city?default("")}</option>
+                    <#if shippingContactMechList?has_content>
+                        <option DISABLED value=""></option>
+                        <#list shippingContactMechList as shippingContactMech>
+                        <#assign shippingPostalAddress = shippingContactMech.getRelatedOne("PostalAddress")?if_exists>
+                           <#if shippingContactMech.contactMechId?has_content>
+                           <option value="${shippingContactMech.contactMechId?if_exists}">${(shippingPostalAddress.address1)?default("")}
- ${shippingPostalAddress.city?default("")}</option>
+                           </#if>
+                        </#list>
+                    </#if>
                  </select>
               <#else>
                  ${(shipGroupAddress.address1)?default("")}



Mime
View raw message