From 995713033d9d1c87eb51cdcac1cd7f61d9cbe0d7 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jordan=20Aug=C3=A9?= <jordan.auge@lip6.fr>
Date: Tue, 29 Oct 2013 17:56:34 +0100
Subject: [PATCH] removed ple-dependent request (test?)
---
portal/dashboardview.py | 2 +-
portal/views.py | 11 +++++++++--
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/portal/dashboardview.py b/portal/dashboardview.py
index 91f4016a..1cc12e0e 100644
--- 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('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)
diff --git a/portal/views.py b/portal/views.py
index da692206..deb4fadb 100644
--- 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(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()
@@ -313,7 +320,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('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:
--
2.47.0