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 2013/12/30 22:41:43 UTC
svn commit: r1554324 - in /ofbiz/branches/release12.04: ./
applications/party/webapp/partymgr/WEB-INF/actions/party/GetPostalAddressTemplate.groovy
Author: jleroux
Date: Mon Dec 30 21:41:43 2013
New Revision: 1554324
URL: http://svn.apache.org/r1554324
Log:
"Applied fix from trunk for revision: 1554290"
------------------------------------------------------------------------
r1554290 | adrianc | 2013-12-30 19:15:49 +0100 (lun. 30 déc. 2013) | 2 lignes
Fixed a bug in Party Manager where FreeMarker threw an exception when a PostalAddress did not contain a country GEO ID.
------------------------------------------------------------------------
Modified:
ofbiz/branches/release12.04/ (props changed)
ofbiz/branches/release12.04/applications/party/webapp/partymgr/WEB-INF/actions/party/GetPostalAddressTemplate.groovy
Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1554290
Modified: ofbiz/branches/release12.04/applications/party/webapp/partymgr/WEB-INF/actions/party/GetPostalAddressTemplate.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/party/webapp/partymgr/WEB-INF/actions/party/GetPostalAddressTemplate.groovy?rev=1554324&r1=1554323&r2=1554324&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/party/webapp/partymgr/WEB-INF/actions/party/GetPostalAddressTemplate.groovy (original)
+++ ofbiz/branches/release12.04/applications/party/webapp/partymgr/WEB-INF/actions/party/GetPostalAddressTemplate.groovy Mon Dec 30 21:41:43 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;