X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceview.py;h=9b96d4f413149431c28bd81e6036bb51c121841c;hb=4a99831db81024d5d25869d4c475d381fd39f75a;hp=175a40e6a3f7b7d034f89ffc7b4e7fdc571a7ee1;hpb=33685b5e51564e1d4d61f32b2ab6be45436fb692;p=myslice.git

diff --git a/portal/sliceview.py b/portal/sliceview.py
index 175a40e6..9b96d4f4 100644
--- a/portal/sliceview.py
+++ b/portal/sliceview.py
@@ -21,6 +21,8 @@ from plugins.active_filters          import ActiveFilters
 from plugins.quickfilter             import QuickFilter
 from plugins.messages                import Messages
 
+from myslice.config                  import Config
+
 tmp_default_slice='ple.upmc.myslicedemo'
 
 # temporary : turn off the users part to speed things up
@@ -33,8 +35,9 @@ class SliceView (LoginRequiredAutoLogoutView):
         page = Page(request)
         page.add_css_files ('css/slice-view.css')
         page.add_js_files  ( [ "js/common.functions.js" ] )
-        page.add_js_chunks ('$(function() { console.log("sliceview: jQuery version " + $.fn.jquery); });')
-        page.add_js_chunks ('$(function() { console.log("sliceview: users turned %s"); });'%("on" if do_query_users else "off"))
+        page.add_js_chunks ('$(function() { messages.debug("sliceview: jQuery version " + $.fn.jquery); });')
+        page.add_js_chunks ('$(function() { messages.debug("sliceview: users turned %s"); });'%("on" if do_query_users else "off"))
+        page.add_js_chunks ('$(function() { messages.debug("manifold URL %s"); });'%(Config.manifold_url()))
         page.expose_js_metadata()
     
         metadata = page.get_metadata()
@@ -48,7 +51,8 @@ class SliceView (LoginRequiredAutoLogoutView):
         main_query = Query.get('slice').filter_by('slice_hrn', '=', slicename)
         main_query.select(
                 'slice_hrn',
-                'resource.resource_hrn', 'resource.hostname', 'resource.type', 'resource.network_hrn',
+                'resource.hrn', 'resource.hostname', 'resource.type', 
+                'resource.network_hrn',
                 #'lease.urn',
                 'user.user_hrn',
                 #'application.measurement_point.counter'
@@ -102,10 +106,38 @@ class SliceView (LoginRequiredAutoLogoutView):
             title               = 'Pending operations',
             query               = main_query,
             togglable           = True,
+            # start turned off, it will open up itself when stuff comes in
+            toggled             = False, 
             domid               = 'pending',
             outline_complete    = True,
         ))
-    
+
+        # --------------------------------------------------------------------------
+        # Filter Resources
+       
+        filter_query_editor = QueryEditor(
+            page  = page,
+            query = query_resource_all,
+            title = "Select Columns",
+            domid = 'select-columns',
+            )
+        filter_active_filters = ActiveFilters(
+            page  = page,
+            query = sq_resource,
+            title = "Active Filters",
+            )
+        filters_area = Stack(
+            page                = page,
+            title               = 'Filter Resources',
+            domid               = 'filters',
+            sons                = [filter_query_editor, filter_active_filters],
+            togglable           = True,
+            # start turned off, it will open up itself when stuff comes in
+            toggled             = False,
+            outline_complete    = True, 
+        )
+        main_stack.insert (filters_area)
+
         # --------------------------------------------------------------------------
         # RESOURCES
         # the resources part is made of a Tabs (Geographic, List), 
@@ -133,26 +165,12 @@ class SliceView (LoginRequiredAutoLogoutView):
             query_all  = query_resource_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,
                 'bAutoWidth'    : True,
                 },
             )
 
-        resources_query_editor = QueryEditor(
-            page  = page,
-            query = query_resource_all,
-            title = "Select Columns",
-            )
-        resources_active_filters = ActiveFilters(
-            page  = page,
-            query = sq_resource,
-            title = "Active Filters ?",
-            )
-
         # List area itself is a Stack with hazelnut on top,
         # and a togglable tabs for customization plugins 
         resources_as_list_area = Stack(
@@ -166,7 +184,7 @@ class SliceView (LoginRequiredAutoLogoutView):
                            toggled='persistent',
                            domid="customize-resources",
                            outline_complete=True,
-                           sons = [ resources_query_editor, resources_active_filters, ],
+                           #sons = [ resources_query_editor, resources_active_filters, ],
                            ),
                     ],
             )
@@ -191,14 +209,14 @@ class SliceView (LoginRequiredAutoLogoutView):
                 outline_complete    = True,
                 togglable           = True,
                 title               = 'Users',
-                active_domid        = 'checkboxes2',
+                active_domid        = 'users-list',
                 )
             main_stack.insert(tab_users)
     
             tab_users.insert(Hazelnut( 
                 page        = page,
                 title       = 'Users List',
-                domid       = 'checkboxes2',
+                domid       = 'users-list',
                 # tab's sons preferably turn this off
                 togglable   = False,
                 # this is the query at the core of the slice list
@@ -216,7 +234,7 @@ class SliceView (LoginRequiredAutoLogoutView):
         # MEASUREMENTS
         tab_measurements = Tabs (
             page                = page,
-            active_domid        = 'checkboxes3',
+            active_domid        = 'measurements-list',
             outline_complete    = True,
             togglable           = True,
             title               = 'Measurements',
@@ -227,11 +245,13 @@ class SliceView (LoginRequiredAutoLogoutView):
         tab_measurements.insert(Hazelnut( 
             page        = page,
             title       = 'Measurements',
-            domid       = 'checkboxes3',
+            domid       = 'measurements-list',
             # tab's sons preferably turn this off
             togglable   = False,
             # this is the query at the core of the slice list
             query       = sq_measurement,
+            # do NOT set checkboxes to False
+            # this table being otherwise empty, it just does not fly with dataTables
             checkboxes  = True,
             datatables_options = { 
                 'iDisplayLength' : 25,