svn commit: r452764 - /incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl

Author: jleroux
Date: Tue Oct  3 23:45:22 2006
New Revision: 452764

URL: http://svn.apache.org/viewvc?view=rev&rev=452764
Log:
A patch from Eriks Dobelis "Display of country name instead of id in Party" (was ok in eCommerce)
(https://issues.apache.org/jira/browse/OFBIZ-356)

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

Modified: incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl?view=diff&rev=452764&r1=452763&r2=452764
==============================================================================
--- incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl (original)
+++ incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl Tue Oct  3 23:45:22 2006
@@ -173,11 +173,15 @@
       <td width="74%">
         <select name="countryGeoId" class="selectBox">
           <#if (mechMap.postalAddress?exists) && (mechMap.postalAddress.countryGeoId?exists)>
-          <option selected>${(mechMap.postalAddress.countryGeoId)?if_exists}</option>
+          <#assign defaultCountryGeoId = (mechMap.postalAddress.countryGeoId)>
+          <option selected value="${defaultCountryGeoId}">
           <#else>
            <#assign defaultCountryGeoId = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("general.properties", "country.geo.id.default")>
-           <option selected value="${defaultCountryGeoId}">${defaultCountryGeoId}</option>
+           <option selected value="${defaultCountryGeoId}">
           </#if>
+          <#assign countryGeo = delegator.findByPrimaryKey("Geo",Static["org.ofbiz.base.util.UtilMisc"].toMap("geoId",defaultCountryGeoId))>
+          ${countryGeo.get("geoName",locale)}
+          </option>
           <option></option>
           ${screens.render("component://common/widget/CommonScreens.xml#countries")}
         </select>