Merge branch 'master' of ssh://git.onelab.eu/git/myslice

[myslice.git] / portal / sliceview.py

diff --git a/portal/sliceview.py b/portal/sliceview.py
index 0da7ead..a4efdbd 100644 (file)
--- 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,6 +106,8 @@ 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,
         ))
@@ -143,6 +149,7 @@ class SliceView (LoginRequiredAutoLogoutView):
             page  = page,
             query = query_resource_all,
             title = "Select Columns",
+            domid = 'select-columns',
             )
         resources_active_filters = ActiveFilters(
             page  = page,
@@ -229,7 +236,9 @@ class SliceView (LoginRequiredAutoLogoutView):
             togglable   = False,
             # this is the query at the core of the slice list
             query       = sq_measurement,
-            checkboxes  = False,
+            # do NOT set checkboxes to False
+            # this table being otherwise empty, it just does not fly with dataTables
+            checkboxes  = True,
             datatables_options = { 
                 'iDisplayLength' : 25,
                 'bLengthChange'  : True,