[Zenoss-commit] r9352 - in trunk/Products: ZenModel ZenWidgets/skins/zenui/javascript

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

Author: ian
Date: 2008-05-27 15:50:29 -0400 (Tue, 27 May 2008)
New Revision: 9352

Modified:
   trunk/Products/ZenModel/DataRoot.py
   trunk/Products/ZenWidgets/skins/zenui/javascript/geomap-2.1.js
   trunk/Products/ZenWidgets/skins/zenui/javascript/geomap.js
Log:
 * Fixes #3234: Only post the cache if dirty, and decode the cache utf-8

Modified: trunk/Products/ZenModel/DataRoot.py
===================================================================
--- trunk/Products/ZenModel/DataRoot.py	2008-05-27 18:43:48 UTC (rev 9351)
+++ trunk/Products/ZenModel/DataRoot.py	2008-05-27 19:50:29 UTC (rev 9352)
@@ -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: trunk/Products/ZenWidgets/skins/zenui/javascript/geomap-2.1.js
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/javascript/geomap-2.1.js	2008-05-27 18:43:48 UTC (rev 9351)
+++ trunk/Products/ZenWidgets/skins/zenui/javascript/geomap-2.1.js	2008-05-27 19:50:29 UTC (rev 9352)
@@ -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: trunk/Products/ZenWidgets/skins/zenui/javascript/geomap.js
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/javascript/geomap.js	2008-05-27 18:43:48 UTC (rev 9351)
+++ trunk/Products/ZenWidgets/skins/zenui/javascript/geomap.js	2008-05-27 19:50:29 UTC (rev 9352)
@@ -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){