X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fdashboardview.py;h=4beb7a9d53c888303e3d84604cd599e59ce3458d;hb=5df37d96aa758faa548091932a5d00a76aa16551;hp=95abbaf9759816b07fa0ce3f4fc225069a945144;hpb=79b9c7456ed4d38001af597adbf45d022cdea6b1;p=myslice.git

diff --git a/portal/dashboardview.py b/portal/dashboardview.py
index 95abbaf9..4beb7a9d 100644
--- a/portal/dashboardview.py
+++ b/portal/dashboardview.py
@@ -1,6 +1,6 @@
 import json
 from manifold.core.query         import Query
-from manifold.manifoldapi        import execute_query
+from manifoldapi.manifoldapi     import execute_query
 
 from unfold.page                 import Page
 
@@ -11,8 +11,12 @@ from unfold.loginrequired        import LoginRequiredAutoLogoutView
 
 from ui.topmenu                  import topmenu_items_live, the_user
 
+from myslice.theme               import ThemeView
+from myslice.settings            import logger
+
+
 #This view requires login 
-class DashboardView (LoginRequiredAutoLogoutView):
+class DashboardView (LoginRequiredAutoLogoutView, ThemeView):
 
     template_name = "dashboard.html"
     
@@ -20,14 +24,13 @@ class DashboardView (LoginRequiredAutoLogoutView):
         # We might have slices on different registries with different user accounts 
         # We note that this portal could be specific to a given registry, to which we register users, but i'm not sure that simplifies things
         # Different registries mean different identities, unless we identify via SFA HRN or have associated the user email to a single hrn
-
         #messages.info(self.request, 'You have logged in')
         page = Page(self.request)
 
-        print "Dashboard page"
+        logger.info("Dashboard page")
         # Slow...
         #slice_query = Query().get('slice').filter_by('user.user_hrn', 'contains', user_hrn).select('slice_hrn')
-        testbed_query  = Query().get('network').select('network_hrn','platform')
+        testbed_query  = Query().get('network').select('network_hrn','platform','version')
         # DEMO GEC18 Query only PLE
 #        user_query  = Query().get('local:user').select('config','email')
 #        user_details = execute_query(self.request, user_query)
@@ -46,13 +49,16 @@ class DashboardView (LoginRequiredAutoLogoutView):
 #            root_authority = sub_authority[0]
 #            slice_query = Query().get(root_authority+':user').filter_by('user_hrn', '==', '$user_hrn').select('user_hrn', 'slice.slice_hrn')
 #        else:
-        slice_query = Query().get('user').filter_by('user_hrn', '==', '$user_hrn').select('user_hrn', 'slice.slice_hrn')
+        logger.debug("SLICE QUERY")
+        logger.debug("-" * 80)
+        slice_query = Query().get('myslice:user').filter_by('user_hrn', '==', '$user_hrn').select('slices.slice_hrn')
         page.enqueue_query(slice_query)
         page.enqueue_query(testbed_query)
 
         slicelist = SliceList(
             page  = page,
             title = "slices",
+            warning_msg = "<a href='../slice_request'>Request Slice</a>",
             query = slice_query,
         )
         testbedlist = TestbedList(
@@ -74,8 +80,9 @@ class DashboardView (LoginRequiredAutoLogoutView):
         # so we can sho who is logged
         context['username'] = the_user(self.request) 
 
+        context['theme'] = self.theme
+        
         page.expose_js_metadata()
-        page.expose_queries()
 
         # the page header and other stuff
         context.update(page.prelude_env())