Updated Service Directory url and cleaned some comments

[unfold.git] / portal / validationview.py

diff --git a/portal/validationview.py b/portal/validationview.py
index 23909b4..f8788d0 100644 (file)
--- a/portal/validationview.py
+++ b/portal/validationview.py
@@ -28,7 +28,7 @@ from django.http                import HttpResponseRedirect, HttpResponse
 from django.shortcuts           import render
 from django.template.loader     import render_to_string
 
-from unfold.loginrequired       import FreeAccessView
+from unfold.loginrequired       import LoginRequiredAutoLogoutView
 from ui.topmenu                 import topmenu_items_live, the_user
 
 from portal.event               import Event
@@ -41,11 +41,12 @@ from plugins.raw                import Raw
 
 from portal.models              import PendingUser, PendingSlice
 from portal.actions             import get_requests
-from manifold.manifoldapi       import execute_query
+from manifoldapi.manifoldapi    import execute_query
 from manifold.core.query        import Query
 from unfold.page                import Page
+from myslice.theme import ThemeView
 
-class ValidatePendingView(FreeAccessView):
+class ValidatePendingView(LoginRequiredAutoLogoutView, ThemeView):
     template_name = "validate_pending.html"
 
     def get_context_data(self, **kwargs):
@@ -59,6 +60,7 @@ class ValidatePendingView(FreeAccessView):
         ctx_my_authorities = {}
         ctx_delegation_authorities = {}
         ctx_sub_authorities = {}
+        dest = {}
 
 
         # The user need to be logged in
@@ -151,8 +153,17 @@ class ValidatePendingView(FreeAccessView):
             pi_authorities_query = Query.get('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:
-                pi_authorities |= set(pa['pi_authorities'])
+            try:
+                for pa in pi_authorities_tmp:
+                    pi_authorities |= set(pa['pi_authorities'])
+            except:
+                print 'No pi_authorities'
+# TODO: exception if no parent_authority
+#             try:
+#                 for pa in pi_authorities_tmp:
+#                     pi_authorities |= set(pa['pi_authorities'])
+#             except:
+
 
 #            # include all sub-authorities of the PI
 #            # if PI on ple, include all sub-auths ple.upmc, ple.inria and so on...
@@ -259,7 +270,9 @@ class ValidatePendingView(FreeAccessView):
         context['topmenu_items'] = topmenu_items_live('Validation', page) 
         # so we can sho who is logged
         context['username'] = the_user(self.request) 
-
+        
+        context['theme'] = self.theme
+        context['section'] = "Requests"
         # XXX We need to prepare the page for queries
         #context.update(page.prelude_env())