svn commit: r735954 - in /ofbiz/trunk: applications/party/webapp/partymgr/WEB-INF/actions/party/ applications/party/webapp/partymgr/party/ framework/common/config/ framework/webtools/config/

Author: jleroux
Date: Mon Jan 19 23:35:11 2009
New Revision: 735954

URL: http://svn.apache.org/viewvc?rev=735954&view=rev
Log:
Fix an issue in case not GeoLocation is available

Modified:
    ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/GeoLocation.groovy
    ofbiz/trunk/applications/party/webapp/partymgr/party/geolocation.ftl
    ofbiz/trunk/framework/common/config/CommonUiLabels.xml
    ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml

Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/GeoLocation.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/GeoLocation.groovy?rev=735954&r1=735953&r2=735954&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/GeoLocation.groovy (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/GeoLocation.groovy Mon Jan 19 23:35:11 2009
@@ -33,7 +33,7 @@
 latestGeoPoint = PartyWorker.findPartyLatestGeoPoint(partyId, delegator);
 context.latestGeoPoint = latestGeoPoint;
 
-if (latestGeoPoint.uomId) {
+if (latestGeoPoint) {
     elevationUom = delegator.findOne("Uom", [uomId : latestGeoPoint.uomId], false);
     context.elevationUomAbbr = elevationUom.abbreviation;
 }

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/geolocation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/geolocation.ftl?rev=735954&r1=735953&r2=735954&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/geolocation.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/geolocation.ftl Mon Jan 19 23:35:11 2009
@@ -44,5 +44,7 @@
       <#elseif  latestGeoPoint.dataSourceId == "GEOPT_MAPTP">      
       </#if>  
     </#if>  
-  </#if>  
+  </#if>
+<#else>
+  <h2>${uiLabelMap.CommonNoGeolocationAvailable}</h2>      
 </#if>

Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=735954&r1=735953&r2=735954&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Mon Jan 19 23:35:11 2009
@@ -3979,6 +3979,10 @@
         <value xml:lang="zh">不包含</value>
         <value xml:lang="zh_CN">不包含</value>
     </property>
+    <property key="CommonNoGeolocationAvailable">
+        <value xml:lang="en">No Geolocation Available</value>
+        <value xml:lang="fr">Aucune géolocalisation disponible</value>
+    </property>    
     <property key="CommonNoUomConversionFound">
         <value xml:lang="ar">علاقة تحويل وحدات القياس غير موجودة</value>
         <value xml:lang="de">Die Beziehung der Einheit für die Konversion wurde nicht gefunden</value>

Modified: ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml?rev=735954&r1=735953&r2=735954&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml (original)
+++ ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml Mon Jan 19 23:35:11 2009
@@ -1585,7 +1585,7 @@
     </property>
     <property key="WebtoolsLogging">
         <value xml:lang="en">Logging</value>
-        <value xml:lang="fr">Voir la Log</value>
+        <value xml:lang="fr">Voir la log</value>
         <value xml:lang="it">Log</value>
         <value xml:lang="th">Logging</value>
     </property>
@@ -2615,7 +2615,7 @@
     </property>
     <property key="WebtoolsServiceEngineTools">
         <value xml:lang="en">Service Engine Tools</value>
-        <value xml:lang="fr">Outils du Service Engine</value>
+        <value xml:lang="fr">Outils du moteur de services</value>
         <value xml:lang="it">Strumenti per Engine Servizi</value>
         <value xml:lang="ro">Instrumente pentru Engin Service</value>
         <value xml:lang="th">เครื่องมือ Service Engine </value>