updates for onelab portal demo

[unfold.git] / portal / views.py

diff --git a/portal/views.py b/portal/views.py
index f213986..f27b178 100644 (file)
--- a/portal/views.py
+++ b/portal/views.py
@@ -22,6 +22,7 @@
 
 from django.conf                 import settings
 from django.contrib.sites.models import Site, RequestSite
+from django.contrib              import messages
 from django.views.generic        import View
 from django.views.generic.base   import TemplateView
 from django.shortcuts            import render
@@ -32,6 +33,7 @@ from portal.util                 import RegistrationView, ActivationView
 from portal.models               import PendingUser, PendingSlice
 from manifold.core.query         import Query
 from unfold.page                 import Page
+from myslice.viewutils           import topmenu_items, the_user
 
 class DashboardView(TemplateView):
     template_name = "dashboard.html"
@@ -39,11 +41,12 @@ class DashboardView(TemplateView):
     def get_context_data(self, **kwargs):
         user_hrn = 'ple.upmc.jordan_auge'
 
+        #messages.info(self.request, 'You have logged in')
         page = Page(self.request)
 
         # Slow...
         #slice_query = Query().get('slice').filter_by('user.user_hrn', 'contains', user_hrn).select('slice_hrn')
-        slice_query = Query().get('user').filter_by('user_hrn', '==', user_hrn).select('slice.slice_hrn')
+        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')
         page.enqueue_query(slice_query)
         page.enqueue_query(auth_query)
@@ -69,6 +72,14 @@ class DashboardView(TemplateView):
         context['networks'] = authlist.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'
+        # the menu items on the top
+        context['topmenu_items'] = topmenu_items('Dashboard', self.request) 
+        # so we can sho who is logged
+        context['username'] = the_user(self.request) 
+
         context.update(page.prelude_env())
 
         return context