You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2008/07/25 10:39:44 UTC
svn commit: r679704 -
/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl
Author: jleroux
Date: Fri Jul 25 01:39:44 2008
New Revision: 679704
URL: http://svn.apache.org/viewvc?rev=679704&view=rev
Log:
A patch from Luke Prentice "handle empty city in ordercontactinfo.ftl" (https://issues.apache.org/jira/browse/OFBIZ-1895) - OFBIZ-1895
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl?rev=679704&r1=679703&r2=679704&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl Fri Jul 25 01:39:44 2008
@@ -80,7 +80,7 @@
<#if postalAddress.attnName?has_content><span class="label">${uiLabelMap.CommonAttn}</span> ${postalAddress.attnName}<br/></#if>
${postalAddress.address1}<br/>
<#if postalAddress.address2?has_content>${postalAddress.address2}<br/></#if>
- ${postalAddress.city}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId} </#if>
+ ${postalAddress.city?if_exists}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId} </#if>
${postalAddress.postalCode?if_exists}<br/>
${postalAddress.countryGeoId?if_exists}<br/>
<#if !postalAddress.countryGeoId?exists || postalAddress.countryGeoId == "USA">