updated look and feel of the site

[unfold.git] / trash / sliceview.py

diff --git a/trash/sliceview.py b/trash/sliceview.py
index bf7aa2f..252291f 100644 (file)
--- a/trash/sliceview.py
+++ b/trash/sliceview.py
@@ -22,8 +22,9 @@ from plugins.senslabmap.senslabmap   import SensLabMap
 from plugins.querycode.querycode     import QueryCode
 from plugins.quickfilter.quickfilter import QuickFilter
 from plugins.messages.messages       import Messages
+from plugins.updater.updater         import Updater
 
-tmp_default_slice='ple.inria.heartbeat'
+tmp_default_slice='ple.inria.myslicedemo'
 debug = True
 
 @login_required
@@ -53,6 +54,7 @@ def _slice_view (request, slicename):
 
     # TODO The query to run is embedded in the URL
     main_query = Query.get('slice').filter_by('slice_hrn', '=', slicename)
+    query_resource_all = Query.get('resource').select('resource_hrn', 'hostname', 'type', 'authority')
 
     # Get default fields from metadata unless specified
     if not main_query.fields:
@@ -61,16 +63,17 @@ def _slice_view (request, slicename):
         if debug:
             print "METADATA", md_fields
         # TODO Get default fields
-        main_query.fields = [
+        main_query.select(
                 'slice_hrn',
                 'resource.resource_hrn', 'resource.hostname', 'resource.type', 'resource.authority',
                 'lease.urn',
                 'user.user_hrn',
 #                'application.measurement_point.counter'
-        ]
+        )
 
-    aq = AnalyzedQuery(main_query)
+    aq = AnalyzedQuery(main_query, metadata=metadata)
     page.enqueue_query(main_query, analyzed_query=aq)
+    page.enqueue_query(query_resource_all)
 
     # Prepare the display according to all metadata
     # (some parts will be pending, others can be triggered by users).
@@ -133,12 +136,13 @@ def _slice_view (request, slicename):
     )
 
     tab_resource_plugins.insert(Hazelnut( 
-        page        = page,
-        title       = 'List',
-        domid       = 'checkboxes',
+        page           = page,
+        title          = 'List',
+        domid          = 'checkboxes',
         # this is the query at the core of the slice list
-        query       = sq_resource,
-        checkboxes  = True,
+        query          = sq_resource,
+        query_all_uuid = query_resource_all.query_uuid,
+        checkboxes     = True,
         datatables_options = { 
             # for now we turn off sorting on the checkboxes columns this way
             # this of course should be automatic in hazelnut
@@ -236,13 +240,18 @@ def _slice_view (request, slicename):
 
     main_plugin.insert(sq_plugin)
 
-    main_plugin.insert (
-        Messages (
-            page=page,
-            title="Runtime messages for slice %s"%slicename,
-            domid="msgs-pre",
-            levels="ALL",
-            ))
+    main_plugin.insert(Messages(
+        page   = page,
+        title  = "Runtime messages for slice %s"%slicename,
+        domid  = "msgs-pre",
+        levels = "ALL",
+    ))
+    main_plugin.insert(Updater(
+        page   = page,
+        title  = "wont show up as non togglable by default",
+        query  = main_query,
+        label  = "Update slice",
+    ))
     
 
     # END OF JORDAN's CODE