You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2014/08/29 21:02:52 UTC
svn commit: r1621364 - in /ofbiz/branches/release13.07: ./
applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress.ftl
Author: adrianc
Date: Fri Aug 29 19:02:52 2014
New Revision: 1621364
URL: http://svn.apache.org/r1621364
Log:
Merged revision(s) 1621363 from ofbiz/trunk:
Fix broken contact mechanism screenlet.
Modified:
ofbiz/branches/release13.07/ (props changed)
ofbiz/branches/release13.07/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress.ftl
Propchange: ofbiz/branches/release13.07/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1621363
Modified: ofbiz/branches/release13.07/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress.ftl?rev=1621364&r1=1621363&r2=1621364&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress.ftl (original)
+++ ofbiz/branches/release13.07/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress.ftl Fri Aug 29 19:02:52 2014
@@ -24,9 +24,14 @@ under the License.
${postalAddress.city?if_exists},
<#if postalAddress.stateProvinceGeoId?has_content>
<#assign stateProvince = postalAddress.getRelatedOne("StateProvinceGeo", true)>
- ${stateProvince.abbreviation?default(stateProvince.geoId)}
+ ${stateProvince.abbreviation?default(stateProvince.geoName)}
+ </#if>
+ <#if postalAddress.postalCodeGeoId?has_content>
+ <#assign postalCodeGeo = postalAddress.getRelatedOne("PostalCodeGeo", true)>
+ ${postalCodeGeo.geoName}
+ <#else>
+ ${postalAddress.postalCode!}
</#if>
- ${postalAddress.postalCode?if_exists}
<#if postalAddress.countryGeoId?has_content><br />
<#assign country = postalAddress.getRelatedOne("CountryGeo", true)>
${country.get("geoName", locale)?default(country.geoId)}