svn commit: r423200 - /incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/viewprofile.ftl

[sichen]

Author: sichen
Date: Tue Jul 18 12:05:37 2006
New Revision: 423200

URL: http://svn.apache.org/viewvc?rev=423200&view=rev
Log:
Fixed last commit to handle cases where abbreviation or geo names might be null.

Modified:
    incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/viewprofile.ftl

Modified: incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/viewprofile.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/viewprofile.ftl?rev=423200&r1=423199&r2=423200&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/viewprofile.ftl (original)
+++ incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/viewprofile.ftl Tue Jul 18 12:05:37 2006
@@ -183,13 +183,13 @@
                     <#if postalAddress.address2?has_content>${postalAddress.address2}<br/></#if>
                     ${postalAddress.city?if_exists},
                     <#if postalAddress.stateProvinceGeoId?has_content>
-                       <#assign stateProvinceAbbrv = postalAddress.getRelatedOneCache("StateProvinceGeo").getString("abbreviation")>
-                       ${stateProvinceAbbrv}
+                        <#assign stateProvince = postalAddress.getRelatedOneCache("StateProvinceGeo")>
+                        ${stateProvince.abbreviation?default(stateProvince.geoId)}
                     </#if>
                     ${postalAddress.postalCode?if_exists}
                     <#if postalAddress.countryGeoId?has_content><br/>
-                       <#assign countryName = postalAddress.getRelatedOneCache("CountryGeo").getString("geoName")>
-                       ${countryName}
+                         <#assign country = postalAddress.getRelatedOneCache("CountryGeo")>
+                         ${country.geoName?default(country.geoId)}
                     </#if>
                   </div>
                   <#if (postalAddress?has_content && !postalAddress.countryGeoId?has_content) || postalAddress.countryGeoId = "USA">