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

[sichen]

Author: sichen
Date: Tue Jul 18 11:56:16 2006
New Revision: 423199

URL: http://svn.apache.org/viewvc?rev=423199&view=rev
Log:
Changed display of state and country geo to abbreviation and full country name in party manager view profile patch.  Patch from Andrew Yager.  OFBIZ-39

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=423199&r1=423198&r2=423199&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 11:56:16 2006
@@ -182,9 +182,15 @@
                     ${postalAddress.address1?if_exists}<br/>
                     <#if postalAddress.address2?has_content>${postalAddress.address2}<br/></#if>
                     ${postalAddress.city?if_exists},
-                    ${postalAddress.stateProvinceGeoId?if_exists}
+                    <#if postalAddress.stateProvinceGeoId?has_content>
+                       <#assign stateProvinceAbbrv = postalAddress.getRelatedOneCache("StateProvinceGeo").getString("abbreviation")>
+                       ${stateProvinceAbbrv}
+                    </#if>
                     ${postalAddress.postalCode?if_exists}
-                    <#if postalAddress.countryGeoId?has_content><br/>${postalAddress.countryGeoId}</#if>
+                    <#if postalAddress.countryGeoId?has_content><br/>
+                       <#assign countryName = postalAddress.getRelatedOneCache("CountryGeo").getString("geoName")>
+                       ${countryName}
+                    </#if>
                   </div>
                   <#if (postalAddress?has_content && !postalAddress.countryGeoId?has_content) || postalAddress.countryGeoId = "USA">
                       <#assign addr1 = postalAddress.address1?if_exists>