updated myslice

diff --git a/manifoldapi/static/js/manifold.js b/manifoldapi/static/js/manifold.js
index b9cd225..b6d2d21 100644 (file)
--- a/manifoldapi/static/js/manifold.js
+++ b/manifoldapi/static/js/manifold.js
@@ -1648,6 +1648,7 @@ var manifold = {
                         manifold.raise_record_event(query_uuid, FIELD_STATE_CHANGED, data);
 
                     case 'lease':
                         manifold.raise_record_event(query_uuid, FIELD_STATE_CHANGED, data);
 
                     case 'lease':

+                    /*

                         var resource_key = record.resource;
                         var resource_query = query_ext.parent_query_ext.query.subqueries['resource'];
                         var warnings = manifold.query_store.get_record_state(resource_query.query_uuid, resource_key, STATE_WARNINGS);
                         var resource_key = record.resource;
                         var resource_query = query_ext.parent_query_ext.query.subqueries['resource'];
                         var warnings = manifold.query_store.get_record_state(resource_query.query_uuid, resource_key, STATE_WARNINGS);


@@ -1681,6 +1682,7 @@ var manifold = {
                         };
                         manifold.raise_record_event(resource_query.query_uuid, FIELD_STATE_CHANGED, data);
                         break;
                         };
                         manifold.raise_record_event(resource_query.query_uuid, FIELD_STATE_CHANGED, data);
                         break;

+                    */

                 }
 
 
                 }
 
 

diff --git a/plugins/googlemap/__init__.py b/plugins/googlemap/__init__.py
index a769f7f..08f2a7b 100644 (file)
--- a/plugins/googlemap/__init__.py
+++ b/plugins/googlemap/__init__.py
@@ -8,12 +8,10 @@ class GoogleMap (Plugin):
     # googlemap_key :   mandatory googlemap API v3 key
     # latitude,longitude, zoom : the starting point
     # apparently at some point there has been support for a boolean 'checkboxes' input arg but seems dropped
     # googlemap_key :   mandatory googlemap API v3 key
     # latitude,longitude, zoom : the starting point
     # apparently at some point there has been support for a boolean 'checkboxes' input arg but seems dropped

-    def __init__ (self, query, query_all, googlemap_api_key=None, latitude=43., longitude=7., zoom=4, **settings):
+    def __init__ (self, query, googlemap_api_key=None, latitude=43., longitude=7., zoom=4, **settings):

         Plugin.__init__ (self, **settings)
         self.query=query
         Plugin.__init__ (self, **settings)
         self.query=query

-        self.query_all = query_all

         self.googlemap_api_key=googlemap_api_key
         self.googlemap_api_key=googlemap_api_key

-        self.query_all_uuid = query_all.query_uuid if query_all else None

         self.latitude=latitude
         self.longitude=longitude
         self.zoom=zoom
         self.latitude=latitude
         self.longitude=longitude
         self.zoom=zoom


@@ -45,7 +43,7 @@ class GoogleMap (Plugin):
 
     # the list of things passed to the js plugin
     def json_settings_list (self): 
 
     # the list of things passed to the js plugin
     def json_settings_list (self): 

-        return [ 'plugin_uuid', 'query_uuid', 'query_all_uuid',
+        return [ 'plugin_uuid', 'query_uuid',

                  'init_key',
                  'latitude', 'longitude', 'zoom', 
                  ]
                  'init_key',
                  'latitude', 'longitude', 'zoom', 
                  ]

diff --git a/portal/sliceresourceview.py b/portal/sliceresourceview.py
index 40c49f1..49230df 100644 (file)
--- a/portal/sliceresourceview.py
+++ b/portal/sliceresourceview.py
@@ -157,7 +157,6 @@ class SliceResourceView (LoginRequiredView, ThemeView):
             # tab's sons preferably turn this off
             togglable  = False,
             query      = sq_resource,
             # tab's sons preferably turn this off
             togglable  = False,
             query      = sq_resource,

-            query_all  = query_resource_all,

             # this key is the one issued by google
             googlemap_api_key = ConfigEngine().googlemap_api_key(),
             # the key to use at init-time
             # this key is the one issued by google
             googlemap_api_key = ConfigEngine().googlemap_api_key(),
             # the key to use at init-time