removed ple-dependent request (test?)

diff --git a/portal/dashboardview.py b/portal/dashboardview.py
index 91f4016..1cc12e0 100644 (file)
--- a/portal/dashboardview.py
+++ b/portal/dashboardview.py
@@ -24,7 +24,7 @@ class DashboardView (LoginRequiredAutoLogoutView):
         #slice_query = Query().get('slice').filter_by('user.user_hrn', 'contains', user_hrn).select('slice_hrn')
         auth_query  = Query().get('network').select('network_hrn','platform')
         # DEMO GEC18 Query only PLE
         #slice_query = Query().get('slice').filter_by('user.user_hrn', 'contains', user_hrn).select('slice_hrn')
         auth_query  = Query().get('network').select('network_hrn','platform')
         # DEMO GEC18 Query only PLE

-        slice_query = Query().get('ple:user').filter_by('user_hrn', '==', '$user_hrn').select('user_hrn', 'slice.slice_hrn')
+        slice_query = Query().get('user').filter_by('user_hrn', '==', '$user_hrn').select('user_hrn', 'slice.slice_hrn')

         page.enqueue_query(slice_query)
         page.enqueue_query(auth_query)
 
         page.enqueue_query(slice_query)
         page.enqueue_query(auth_query)
 

diff --git a/portal/views.py b/portal/views.py
index da69220..deb4fad 100644 (file)
--- a/portal/views.py
+++ b/portal/views.py
@@ -272,7 +272,14 @@ class ValidatePendingView(TemplateView):
                 platform_ids.append(sfa_platform['platform_id'])
 
             print "W: Hardcoding platform myslice"
                 platform_ids.append(sfa_platform['platform_id'])
 
             print "W: Hardcoding platform myslice"

-            platform_ids.append(5);
+            # There has been a tweak on how new platforms are referencing a
+            # so-called 'myslice' platform for storing authentication tokens.
+            # XXX This has to be removed in final versions.
+            myslice_platforms_query = Query().get('local:platform').filter_by('platform', '==', 'myslice').select('platform_id')
+            myslice_platforms = execute_query(self.request, myslice_platforms_query)
+            if myslice_platforms:
+                myslice_platform, = myslice_platforms
+                platform_ids.append(myslice_platform['platform_id'])

 
             # We can check on which the user has authoritity credentials = PI rights
             credential_authorities = set()
 
             # We can check on which the user has authoritity credentials = PI rights
             credential_authorities = set()


@@ -313,7 +320,7 @@ class ValidatePendingView(TemplateView):
 
             # ** Where am I a PI **
             # For this we need to ask SFA (of all authorities) = PI function
 
             # ** Where am I a PI **
             # For this we need to ask SFA (of all authorities) = PI function

-            pi_authorities_query = Query.get('ple:user').filter_by('user_hrn', '==', '$user_hrn').select('pi_authorities')
+            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_tmp = execute_query(self.request, pi_authorities_query)
             pi_authorities = set()
             for pa in pi_authorities_tmp: