sliceview uses validatebutton

[myslice.git] / portal / sliceview.py

diff --git a/portal/sliceview.py b/portal/sliceview.py
index 032b648..8e103a1 100644 (file)
--- a/portal/sliceview.py
+++ b/portal/sliceview.py
@@ -10,6 +10,7 @@ from manifold.manifoldapi            import execute_query
 
 from ui.topmenu                      import topmenu_items, the_user
 
+from plugins.validatebutton          import ValidateButton
 from plugins.raw                     import Raw
 from plugins.stack                   import Stack
 from plugins.tabs                    import Tabs
@@ -58,8 +59,9 @@ class SliceView (LoginRequiredAutoLogoutView):
         page.add_js_chunks ('$(function() { messages.debug("sliceview: leases turned %s"); });'%("on" if do_query_leases else "off"))
         config=Config()
         page.add_js_chunks ('$(function() { messages.debug("manifold URL %s"); });'%(config.manifold_url()))
+
         page.expose_js_metadata()
-    
+
         metadata = page.get_metadata()
         resource_md = metadata.details_by_object('resource')
         resource_fields = [column['name'] for column in resource_md['column']]
@@ -71,7 +73,8 @@ class SliceView (LoginRequiredAutoLogoutView):
         main_query = Query.get('slice').filter_by('slice_hrn', '=', slicename)
         main_query.select(
                 'slice_hrn',
-                'resource.hrn', 'resource.urn', 'resource.hostname', 'resource.type', 
+                #'resource.hrn', 'resource.urn', 
+                'resource.hostname', 'resource.type', 
                 'resource.network_hrn',
                 'lease.urn',
                 'user.user_hrn',
@@ -79,7 +82,7 @@ class SliceView (LoginRequiredAutoLogoutView):
         )
         # for internal use in the querytable plugin;
         # needs to be a unique column present for each returned record
-        #main_query_key = 'hrn'
+        main_query_init_key = 'hostname'
     
         query_resource_all = Query.get('resource').select(resource_fields)
 
@@ -198,7 +201,10 @@ class SliceView (LoginRequiredAutoLogoutView):
             togglable  = False,
             query      = sq_resource,
             query_all  = query_resource_all,
+            # this key is the one issued by google
             googlemap_api_key = Config().googlemap_api_key(),
+            # the key to use at init-time
+            init_key   = main_query_init_key,
             checkboxes = True,
             # center on Paris
             latitude   = 49.,
@@ -221,8 +227,8 @@ class SliceView (LoginRequiredAutoLogoutView):
             # this is the query at the core of the slice list
             query      = sq_resource,
             query_all  = query_resource_all,
-            # safer to use 'hrn' as the internal unique key for this plugin
-            #id_key     = main_query_key,
+            # use 'hrn' as the internal unique key for this plugin
+            init_key     = main_query_init_key,
             checkboxes = True,
             datatables_options = { 
                 'iDisplayLength': 25,
@@ -239,8 +245,9 @@ class SliceView (LoginRequiredAutoLogoutView):
                 # this is the query at the core of the slice list
                 query      = sq_resource,
                 query_all  = query_resource_all,
-                # safer to use 'hrn' as the internal unique key for this plugin
-                id_key     = main_query_key,
+                # use 'hrn' as the internal unique key for this plugin
+                # xxx todo on querygrid as well
+                # init_key     = main_query_init_key,
                 checkboxes = True,
                 )
 
@@ -270,8 +277,6 @@ class SliceView (LoginRequiredAutoLogoutView):
         if insert_grid:
             resources_sons.append(resources_as_grid)
 
-        print 40*'+-',"resources_sons has",len(resources_sons),"son"
-
         resources_area = Tabs ( page=page, 
                                 domid="resources",
                                 togglable=True,
@@ -416,7 +421,23 @@ class SliceView (LoginRequiredAutoLogoutView):
                     outline_complete = True,
                     ))
     
-    
+# topmenu animation
+# xxx all this should go into a plugin if its own with the topmenu and all...
+        query_pi_auths = Query.get('ple:user').filter_by('user_hrn', '==', '$user_hrn' ).select('pi_authorities')
+        page.enqueue_query(query_pi_auths)
+        # even though this plugin does not have any html materialization, the corresponding domid
+        # must exist because it is searched at init-time to create the JS plugin
+        # so we simply piggy-back the target button here
+        validatebutton = ValidateButton (page=page, 
+                                         # see above
+                                         domid='topmenu-validation',
+                                         query=query_pi_auths,
+                                         # this one is the target for a $.show() when the query comes back
+                                         button_domid="topmenu-validation")
+        # although the result does not matter, rendering is required for the JS init code to make it in the page
+        validatebutton.render(request)
+# end topmenu addition
+
         # variables that will get passed to the view-unfold1.html template
         template_env = {}