From d81f8a7e4806a65b758c8b3f675c71490bfc8120 Mon Sep 17 00:00:00 2001 From: Loic Baron Date: Thu, 23 Apr 2015 14:28:18 +0200 Subject: [PATCH] Join project: optimize queries --- portal/projectrequestview.py | 5 ++++- portal/templates/fed4fire/fed4fire_projectrequest_view.html | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/portal/projectrequestview.py b/portal/projectrequestview.py index 932c9ab1..13c49606 100644 --- a/portal/projectrequestview.py +++ b/portal/projectrequestview.py @@ -20,7 +20,10 @@ class ProjectRequestView(LoginRequiredAutoLogoutView, ThemeView): template_name = 'projectrequest_view.html' def getAuthorities(self, request): - authorities_query = Query.get('authority').select('name', 'authority_hrn') + if theme.theme == 'fed4fire': + authorities_query = Query.get('myslice:authority').select('name', 'authority_hrn') + else: + authorities_query = Query.get('authority').select('name', 'authority_hrn') authorities = execute_admin_query(request, authorities_query) if authorities is not None: # Remove the root authority from the list diff --git a/portal/templates/fed4fire/fed4fire_projectrequest_view.html b/portal/templates/fed4fire/fed4fire_projectrequest_view.html index 5daf0cce..fd23351b 100644 --- a/portal/templates/fed4fire/fed4fire_projectrequest_view.html +++ b/portal/templates/fed4fire/fed4fire_projectrequest_view.html @@ -166,7 +166,7 @@ $(document).ready(function() { }); /* - $("#authority_hrn").load("/rest/user/", {"fields" : ["parent_authority"], "filters": {"user_hrn": "{{ user_hrn }}"}}, function(data) { + $("#authority_hrn").load("/rest/myslice:user/", {"fields" : ["parent_authority"], "filters": {"user_hrn": "{{ user_hrn }}"}}, function(data) { var jsonData = JSON.parse(data); $(this).attr("value", jsonData[0]['parent_authority']); }); -- 2.43.0