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 2013/12/30 19:17:35 UTC
svn commit: r1554291 -
/ofbiz/branches/release13.07/applications/party/webapp/partymgr/WEB-INF/actions/party/GetPostalAddressTemplate.groovy
Author: adrianc
Date: Mon Dec 30 18:17:35 2013
New Revision: 1554291
URL: http://svn.apache.org/r1554291
Log:
Merged revision(s) 1554290 from ofbiz/trunk:
Fixed a bug in Party Manager where FreeMarker threw an exception when a PostalAddress did not contain a country GEO ID.
Modified:
ofbiz/branches/release13.07/applications/party/webapp/partymgr/WEB-INF/actions/party/GetPostalAddressTemplate.groovy
Modified: ofbiz/branches/release13.07/applications/party/webapp/partymgr/WEB-INF/actions/party/GetPostalAddressTemplate.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/party/webapp/partymgr/WEB-INF/actions/party/GetPostalAddressTemplate.groovy?rev=1554291&r1=1554290&r2=1554291&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/party/webapp/partymgr/WEB-INF/actions/party/GetPostalAddressTemplate.groovy (original)
+++ ofbiz/branches/release13.07/applications/party/webapp/partymgr/WEB-INF/actions/party/GetPostalAddressTemplate.groovy Mon Dec 30 18:17:35 2013
@@ -23,15 +23,11 @@ postalAddressTemplateSuffix = context.po
if (!postalAddressTemplateSuffix) {
postalAddressTemplateSuffix = ".ftl";
}
-
+context.postalAddressTemplate = "PostalAddress" + postalAddressTemplateSuffix;
if (postalAddressForTemplate && postalAddressForTemplate.countryGeoId) {
postalAddressTemplate = "PostalAddress_" + postalAddressForTemplate.countryGeoId + postalAddressTemplateSuffix;
file = new File(addressTemplatePath + postalAddressTemplate);
if (file.exists()) {
context.postalAddressTemplate = postalAddressTemplate;
- } else {
- context.postalAddressTemplate = "PostalAddress" + postalAddressTemplateSuffix;
}
}
-
-context.postalAddress = postalAddressForTemplate;