X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fdashboardview.py;h=44a3ea91294f9c1454dad8ff42c6d1dfccb7ee73;hb=d8b349aeaca7af55f020f7344863003a1a478c0a;hp=961b7dcc39b49a378d8001051d720a98e5740987;hpb=02a6c1aea215c598d92bdcd37d19652800a6d156;p=myslice.git

diff --git a/portal/dashboardview.py b/portal/dashboardview.py
index 961b7dcc..44a3ea91 100644
--- a/portal/dashboardview.py
+++ b/portal/dashboardview.py
@@ -1,11 +1,12 @@
-from manifold.core.query        import Query
-from unfold.page                import Page
+from manifold.core.query         import Query
+from unfold.page                 import Page
 
-from plugins.lists.simplelist    import SimpleList
+from plugins.lists.testbedlist   import TestbedList
+from plugins.lists.slicelist     import SliceList
 
-from portal.templateviews       import LoginRequiredAutoLogoutView
+from unfold.loginrequired        import LoginRequiredAutoLogoutView
 
-from myslice.viewutils           import topmenu_items, the_user
+from ui.topmenu                  import topmenu_items, the_user
 
 #This view requires login 
 class DashboardView (LoginRequiredAutoLogoutView):
@@ -22,38 +23,34 @@ class DashboardView (LoginRequiredAutoLogoutView):
 
         # 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')
+        # DEMO GEC18 Query only PLE
         slice_query = Query().get('user').filter_by('user_hrn', '==', '$user_hrn').select('user_hrn', 'slice.slice_hrn')
-        auth_query  = Query().get('network').select('network_hrn')
-        print "AUTH QUERY =====================", auth_query
-        print "filter", auth_query.filters
         page.enqueue_query(slice_query)
-        page.enqueue_query(auth_query)
+        page.enqueue_query(testbed_query)
 
         page.expose_js_metadata()
         page.expose_queries()
 
-        slicelist = SimpleList(
-            title = None,
+        slicelist = SliceList(
             page  = page,
-            key   = 'slice.slice_hrn',
+            title = "slices",
             query = slice_query,
         )
-         
-        authlist = SimpleList(
-            title = None,
+        testbedlist = TestbedList(
             page  = page,
-            key   = 'network_hrn',
-            query = auth_query,
+            title = "testbeds",
+            query = testbed_query,
         )
-
+ 
         context = super(DashboardView, self).get_context_data(**kwargs)
         context['person']   = self.request.user
-        context['networks'] = authlist.render(self.request) 
+        context['testbeds'] = testbedlist.render(self.request) 
         context['slices']   = slicelist.render(self.request)
 
         # XXX This is repeated in all pages
         # more general variables expected in the template
-        context['title'] = 'Test view that combines various plugins'
+        context['title'] = 'Dashboard'
         # the menu items on the top
         context['topmenu_items'] = topmenu_items('Dashboard', self.request) 
         # so we can sho who is logged