X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fviews.py;h=65d8ea0523d20ff67d589793ad214f061a7009d3;hb=83f3bc8abee6f1312ad9a0a24e63871fc1ee8b16;hp=2029e70bbe25c7c9c65f4afe54b2fe9d62a96eff;hpb=1aea42c3668602aacfe22bc762ee939672129f53;p=unfold.git

diff --git a/portal/views.py b/portal/views.py
index 2029e70b..65d8ea05 100644
--- a/portal/views.py
+++ b/portal/views.py
@@ -28,10 +28,12 @@ from django.views.generic.base  import TemplateView
 from django.shortcuts           import render
 from django.template.loader     import render_to_string
 
-from myslice.viewutils          import topmenu_items, the_user
+from ui.topmenu                 import topmenu_items, the_user
 
-from plugins.pres_view          import PresView
 from portal.event               import Event
+# presview is put in observation for now
+#from plugins.pres_view          import PresView
+from plugins.raw                import Raw
 
 # these seem totally unused for now
 #from portal.util                import RegistrationView, ActivationView
@@ -54,7 +56,8 @@ class PresViewView(TemplateView):
 
         page = Page(self.request)
 
-        pres_view = PresView(page = page)
+#        pres_view = PresView(page = page)
+        pres_view = Raw(page = page,html="<h1>PresView needs to be integrated</h1>")
 
         context = super(PresViewView, self).get_context_data(**kwargs)
 
@@ -299,7 +302,7 @@ class ValidatePendingView(TemplateView):
 
             # ** Where am I a PI **
             # For this we need to ask SFA (of all authorities) = PI function
-            pi_authorities_query = Query.get('user').filter_by('user_hrn', '==', '$user_hrn').select('pi_authorities')
+            pi_authorities_query = Query.get('ple:user').filter_by('user_hrn', '==', '$user_hrn').select('pi_authorities')
             pi_authorities_tmp = execute_query(self.request, pi_authorities_query)
             pi_authorities = set()
             for pa in pi_authorities_tmp:
@@ -372,7 +375,7 @@ class ValidatePendingView(TemplateView):
         # 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) 
+        context['topmenu_items'] = topmenu_items('Validation', self.request) 
         # so we can sho who is logged
         context['username'] = the_user(self.request)