From: Loic Baron <loic.baron@lip6.fr>
Date: Thu, 23 Apr 2015 12:28:18 +0000 (+0200)
Subject: Join project: optimize queries
X-Git-Tag: myslice-1.3~21
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=d81f8a7e4806a65b758c8b3f675c71490bfc8120;p=myslice.git

Join project: optimize queries
---

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']);
     });