X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=trash%2Fsliceview.py;h=eea4e22e39b8551defbd9c5d77138ef5335e2c8c;hb=2f1347ac1031c64b93c0b397add527ef33948974;hp=b50eb26fb343f1060d9606371374ae07db909941;hpb=401546ae932e7f2d120ec210c13e2db1ce754cc7;p=myslice.git

diff --git a/trash/sliceview.py b/trash/sliceview.py
index b50eb26f..eea4e22e 100644
--- a/trash/sliceview.py
+++ b/trash/sliceview.py
@@ -4,6 +4,7 @@ from django.template import RequestContext
 from django.shortcuts import render_to_response
 
 from django.contrib.auth.decorators import login_required
+from django.http import HttpResponseRedirect
 
 from unfold.page import Page
 #from manifold.manifoldquery import ManifoldQuery
@@ -20,8 +21,9 @@ from plugins.querycode.querycode import QueryCode
 from plugins.quickfilter.quickfilter import QuickFilter
 from plugins.messages.messages import Messages
 
-from myslice.viewutils import quickfilter_criterias
+from manifold.manifoldresult import ManifoldException
 
+from myslice.viewutils import quickfilter_criterias
 from myslice.viewutils import topmenu_items, the_user
 
 # XXX JORDAN
@@ -32,29 +34,45 @@ debug = True
 
 @login_required
 def slice_view (request, slicename=tmp_default_slice):
-    
+    # xxx Thierry - ugly hack
+    # fetching metadata here might fail - e.g. with an expired session..
+    # let's catch this early on and log out our user if needed
+    # it should of course be handled in a more generic way
+    try:
+        return _slice_view(request,slicename)
+    except ManifoldException, manifold_result:
+        # xxx needs a means to display this message to user...
+        from django.contrib.auth import logout
+        logout(request)
+        return HttpResponseRedirect ('/')
+    except Exception, e:
+        # xxx we need to sugarcoat this error message in some error template...
+        print "Unexpected exception",e
+        import traceback
+        traceback.print_exc()
+        # return ...
+
+def _slice_view (request, slicename):
+
     page = Page(request)
     page.expose_js_metadata()
 
-
     # TODO The query to run is embedded in the URL
-    main_query = Query({'action': 'get', 'object': 'slice'}).filter_by('slice_hrn', '=', slicename)
+    main_query = Query.get('slice').filter_by('slice_hrn', '=', slicename)
 
     # Get default fields from metadata unless specified
     if not main_query.fields:
-        md_fields = page.get_metadata()
-        md_fields = md_fields.details_by_subject('slice')
+        metadata = page.get_metadata()
+        md_fields = metadata.details_by_object('slice')
         if debug:
             print "METADATA", md_fields
         # TODO Get default fields
-        main_query.fields = ['slice_hrn', 'resource.hrn', 'resource.hostname', 'resource.type', 'resource.authority']
-
-#old#    main_query = ManifoldQuery (action='get',
-#old#                                subject='resource',
-#old#                                timestamp='latest',
-#old#                                fields=['network','type','hrn','hostname'],
-#old#                                filters= [ [ 'slice_hrn', '=', slicename, ] ],
-#old#                                )
+        main_query.fields = [
+                'slice_hrn',
+                'resource.hrn', 'resource.hostname', 'resource.type', 'resource.authority',
+                'user.user_hrn',
+#                'application.measurement_point.counter'
+        ]
 
     aq = AnalyzedQuery(main_query)
     page.enqueue_query(main_query, analyzed_query=aq)
@@ -70,19 +88,15 @@ def slice_view (request, slicename=tmp_default_slice):
         title="Slice view for %s"%slicename,
         domid='thestack',
         togglable=False,
-        sons=[
-            Messages (
-                page=page,
-                title="Runtime messages for slice %s"%slicename,
-                domid="msgs-pre",
-                levels="ALL",
-                ),
-            Raw (page=page,togglable=False, toggled=True,html="<h2> Slice page for %s</h2>"%slicename),
-        ]
+        sons=[],
     )
 
     # ... responsible for the slice properties...
 
+
+    main_plugin.insert (
+        Raw (page=page,togglable=False, toggled=True,html="<h2> Slice page for %s</h2>"%slicename))
+
     main_plugin.insert(
         Raw (page=page,togglable=False, toggled=True,html='<b>Description:</b> TODO')
     )
@@ -101,10 +115,6 @@ def slice_view (request, slicename=tmp_default_slice):
     )
     main_plugin.insert(tab_resources)
 
-    jj = aq.to_json()
-    print "="*80
-    print "AQ=", jj
-    print "="*80
     tab_resources.insert(
         Hazelnut ( 
             page        = page,
@@ -139,6 +149,79 @@ def slice_view (request, slicename=tmp_default_slice):
         )
     )
 
+    # XXX Let's hardcode users also for now
+    sq = aq.subquery('user')
+    
+    tab_users = Tabs (
+        page         = page,
+        title        = 'Users',
+        domid        = 'thetabs2',
+        # activeid   = 'checkboxes',
+        active_domid = 'checkboxes2',
+    )
+    main_plugin.insert(tab_users)
+
+    tab_users.insert(
+        Hazelnut ( 
+            page        = page,
+            title       = '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,
+            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,
+            },
+        )
+    )
+
+    # XXX Let's hardcode measurements also for now
+    sq = aq.subquery('measurement')
+    
+    tab_users = Tabs (
+        page         = page,
+        title        = 'Measurements',
+        domid        = 'thetabs3',
+        # activeid   = 'checkboxes',
+        active_domid = 'checkboxes3',
+    )
+    main_plugin.insert(tab_users)
+
+    tab_users.insert(
+        Hazelnut ( 
+            page        = page,
+            title       = 'List',
+            domid       = 'checkboxes3',
+            # tab's sons preferably turn this off
+            togglable   = False,
+            # this is the query at the core of the slice list
+            query       = sq,
+            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,
+            },
+        )
+    )
+
+    main_plugin.insert (
+        Messages (
+            page=page,
+            title="Runtime messages for slice %s"%slicename,
+            domid="msgs-pre",
+            levels="ALL",
+            ))
+    
+
     # END OF JORDAN's CODE
 
 #old#    main_plugin = Stack (