Link to Validation page in the top menu, limited users to PLE for the GEC18 DEMO

[unfold.git] / portal / views.py

diff --git a/portal/views.py b/portal/views.py
index 78a74cd..65d8ea0 100644 (file)
--- a/portal/views.py
+++ b/portal/views.py
@@ -23,29 +23,26 @@
 
 import json
 
-from django.http                 import HttpResponseRedirect, HttpResponse
-from django.views.generic.base   import TemplateView
-from django.shortcuts            import render
-from django.template.loader      import render_to_string
-from django.core.mail            import send_mail
-from django.utils.decorators     import method_decorator
-from django.contrib.auth.decorators import login_required
-
-from myslice.viewutils           import topmenu_items, the_user
-
-from plugins.lists.simplelist    import SimpleList
-from plugins.hazelnut            import Hazelnut
-from plugins.pres_view           import PresView
-from portal.event import Event
-
-from portal                      import signals
-from portal.forms                import SliceRequestForm
-from portal.util                 import RegistrationView, ActivationView
-from portal.models               import PendingUser, PendingSlice
-from portal.actions              import authority_get_pi_emails, get_request_by_authority, manifold_add_user, manifold_update_user
-from manifold.manifoldapi        import execute_query
-from manifold.core.query         import Query
-from unfold.page                 import Page
+from django.http                import HttpResponseRedirect, HttpResponse
+from django.views.generic.base  import TemplateView
+from django.shortcuts           import render
+from django.template.loader     import render_to_string
+
+from ui.topmenu                 import topmenu_items, the_user
+
+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
+
+from portal.models              import PendingUser, PendingSlice
+from portal.actions             import get_request_by_authority
+from manifold.manifoldapi       import execute_query
+from manifold.core.query        import Query
+from unfold.page                import Page
 
 # NOTE
 # initially all the portal views were defined in this single file
@@ -59,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)
 
@@ -304,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:
@@ -377,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)