[Zenoss-commit] r9399 - in branches/zenoss-2.2.x/Products: ZenModel ZenWidgets/skins/zenui/javascript

[<sv...@ze...>]

Author: ian
Date: 2008-06-03 14:39:34 -0400 (Tue, 03 Jun 2008)
New Revision: 9399

Modified:
   branches/zenoss-2.2.x/Products/ZenModel/DataRoot.py
   branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/javascript/geomap-2.1.js
   branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/javascript/geomap.js
Log:
 * Refs #3234: Backporting r9352 to the 2.2.x branch

Modified: branches/zenoss-2.2.x/Products/ZenModel/DataRoot.py
===================================================================
--- branches/zenoss-2.2.x/Products/ZenModel/DataRoot.py	2008-06-03 18:37:53 UTC (rev 9398)
+++ branches/zenoss-2.2.x/Products/ZenModel/DataRoot.py	2008-06-03 18:39:34 UTC (rev 9399)
@@ -501,6 +501,8 @@
             the Google Maps geocode cache
         """
         cache = extractPostContent(REQUEST)
+        try: cache = cache.decode('utf-8')
+        except: pass
         self.geocache = cache
         return True
 

Modified: branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/javascript/geomap-2.1.js
===================================================================
--- branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/javascript/geomap-2.1.js	2008-06-03 18:37:53 UTC (rev 9398)
+++ branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/javascript/geomap-2.1.js	2008-06-03 18:39:34 UTC (rev 9399)
@@ -145,9 +145,9 @@
                 'simpleLocationGeoMap'
             );
             var summarytext = node[3];
+            if (address) {
             if (this.cache.get(address)==null)
                 this.dirtycache = true;
-            if (address) {
             this.geocode(
                 address,
                 bind(function(p){

Modified: branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/javascript/geomap.js
===================================================================
--- branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/javascript/geomap.js	2008-06-03 18:37:53 UTC (rev 9398)
+++ branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/javascript/geomap.js	2008-06-03 18:39:34 UTC (rev 9399)
@@ -141,9 +141,9 @@
             var color = node[1];
             var clicklink = node[2];
             var summarytext = node[3];
+            if (address) {
             if (this.cache.get(address)==null)
                 this.dirtycache = true;
-            if (address) {
             this.geocode(
                 address,
                 bind(function(p){