X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceview.py;h=d27d67757cff96a058d478e68bb6caf9fb0a058f;hb=506d53313a317ac1af631a15f489ef6f73bfc8a4;hp=78d5fb8821443262f3b0466c060870e2244751f2;hpb=ceaa4271ec96d47dc4e8d1eb727d82364a9032aa;p=myslice.git

diff --git a/portal/sliceview.py b/portal/sliceview.py
index 78d5fb88..d27d6775 100644
--- a/portal/sliceview.py
+++ b/portal/sliceview.py
@@ -11,7 +11,6 @@ from myslice.viewutils               import topmenu_items, the_user
 from plugins.raw.raw                 import Raw
 from plugins.stack.stack             import Stack
 from plugins.tabs.tabs               import Tabs
-from plugins.lists.slicelist         import SliceList
 from plugins.hazelnut                import Hazelnut 
 from plugins.resources_selected      import ResourcesSelected
 from plugins.googlemaps              import GoogleMaps
@@ -25,12 +24,17 @@ from plugins.messages.messages       import Messages
 
 tmp_default_slice='ple.upmc.myslicedemo'
 
+# temporary : turn off the users part to speed things up
+do_query_users=True
+
 class SliceView (LoginRequiredAutoLogoutView):
 
     def get (self,request, slicename=tmp_default_slice):
     
         page = Page(request)
         page.add_css_files ('css/slice-view.css')
+        page.add_js_chunks ('$(function() { console.log("sliceview: jQuery version " + $.fn.jquery); });')
+        page.add_js_chunks ('$(function() { console.log("users turned %s"); });'%"on" if do_query_users else "off")
         page.expose_js_metadata()
     
         metadata = page.get_metadata()
@@ -51,18 +55,20 @@ class SliceView (LoginRequiredAutoLogoutView):
         )
     
         query_resource_all = Query.get('resource').select(resource_fields)
-        query_user_all = Query.get('user').select(user_fields)
+        if do_query_users:
+            query_user_all = Query.get('user').select(user_fields)
     
         aq = AnalyzedQuery(main_query, metadata=metadata)
         page.enqueue_query(main_query, analyzed_query=aq)
         page.enqueue_query(query_resource_all)
-        page.enqueue_query(query_user_all)
+        if do_query_users:
+            page.enqueue_query(query_user_all)
     
         # ... and for the relations
         # XXX Let's hardcode resources for now
-        sq_resource = aq.subquery('resource')
-        sq_user     = aq.subquery('user')
-        sq_lease    = aq.subquery('lease')
+        sq_resource    = aq.subquery('resource')
+        sq_user        = aq.subquery('user')
+        sq_lease       = aq.subquery('lease')
         sq_measurement = aq.subquery('measurement')
         
     
@@ -88,6 +94,18 @@ class SliceView (LoginRequiredAutoLogoutView):
                  html="<h2 class='well well-lg'> Slice %s</h2>"%slicename)
         )
     
+        # --------------------------------------------------------------------------
+        # ResourcesSelected
+        #
+        main_stack.insert(ResourcesSelected(
+            page                = page,
+            title               = 'Pending operations',
+            query               = main_query,
+            togglable           = True,
+            domid               = 'pending',
+            outline_complete    = True,
+        ))
+    
 #        main_stack.insert(
 #            Raw (page=page,togglable=False, toggled=True,html='<b>Description:</b> TODO')
 #        )
@@ -189,34 +207,35 @@ class SliceView (LoginRequiredAutoLogoutView):
         # USERS
         # 
     
-        tab_users = Tabs(
-            page                = page,
-            domid               = 'users',
-            outline_complete    = True,
-            togglable           = True,
-            title               = 'Users',
-            active_domid        = 'checkboxes2',
-        )
-        main_stack.insert(tab_users)
+        if do_query_users:
+            tab_users = Tabs(
+                page                = page,
+                domid               = 'users',
+                outline_complete    = True,
+                togglable           = True,
+                title               = 'Users',
+                active_domid        = 'checkboxes2',
+                )
+            main_stack.insert(tab_users)
     
-        tab_users.insert(Hazelnut( 
-            page        = page,
-            title       = 'Users List',
-            domid       = 'checkboxes2',
-            # tab's sons preferably turn this off
-            togglable   = False,
-            # this is the query at the core of the slice list
-            query       = sq_user,
-            query_all  = query_user_all,
-            checkboxes  = True,
-            datatables_options = { 
-                # for now we turn off sorting on the checkboxes columns this way
-                # this of course should be automatic in hazelnut
-                'aoColumns'      : [None, None, None, None, {'bSortable': False}],
-                'iDisplayLength' : 25,
-                'bLengthChange'  : True,
-            },
-        ))
+            tab_users.insert(Hazelnut( 
+                page        = page,
+                title       = 'Users List',
+                domid       = 'checkboxes2',
+                # tab's sons preferably turn this off
+                togglable   = False,
+                # this is the query at the core of the slice list
+                query       = sq_user,
+                query_all  = query_user_all,
+                checkboxes  = True,
+                datatables_options = { 
+                    # for now we turn off sorting on the checkboxes columns this way
+                    # this of course should be automatic in hazelnut
+                    'aoColumns'      : [None, None, None, None, {'bSortable': False}],
+                    'iDisplayLength' : 25,
+                    'bLengthChange'  : True,
+                },
+            ))
     
         tab_measurements = Tabs (
             page                = page,
@@ -246,33 +265,18 @@ class SliceView (LoginRequiredAutoLogoutView):
             },
         ))
     
-#        main_stack.insert(sq_plugin)
-    
-        # --------------------------------------------------------------------------
-        # ResourcesSelected
-        #
-        main_stack.insert(ResourcesSelected(
-            page                = page,
-            title               = 'Pending operations',
-            query               = main_query,
-            togglable           = True,
-            domid               = 'pending',
-            outline_complete    = True,
-        ))
-    
         main_stack.insert(Messages(
             page   = page,
             title  = "Runtime messages for slice %s"%slicename,
             domid  = "msgs-pre",
             levels = "ALL",
+            # plain messages are probably less nice for production but more reliable for development for now
+            transient = False,
+            # these make sense only in non-transient mode..
+            togglable = True,
+            toggled = 'persistent',
+            outline_complete = True,
         ))
-    #    main_stack.insert(Updater(
-    #        page   = page,
-    #        title  = "wont show up as non togglable by default",
-    #        query  = main_query,
-    #        label  = "Update slice",
-    #    ))
-        
     
     
         # variables that will get passed to the view-unfold1.html template