From: Loic Baron <loic.baron@lip6.fr>
Date: Fri, 16 Jan 2015 11:37:01 +0000 (+0100)
Subject: Prefixed Queries for Registry only queries
X-Git-Tag: myslice-1.3~117^2~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4a466fedcdd0e77b71b1f4555a2468108aa417e6;p=myslice.git

Prefixed Queries for Registry only queries
---

diff --git a/portal/institution.py b/portal/institution.py
index 6dd1b20a..ccdb6251 100644
--- a/portal/institution.py
+++ b/portal/institution.py
@@ -35,7 +35,7 @@ class InstitutionView (LoginRequiredAutoLogoutView, ThemeView):
 
         if request.user.is_authenticated(): 
             env['person'] = self.request.user
-            user_query  = Query().get('user').select('user_hrn','parent_authority').filter_by('user_hrn','==','$user_hrn')
+            user_query  = Query().get('myslice:user').select('user_hrn','parent_authority').filter_by('user_hrn','==','$user_hrn')
             user_details = execute_query(self.request, user_query)
             try:
                 env['user_details'] = user_details[0]
diff --git a/portal/managementtabrequests.py b/portal/managementtabrequests.py
index 31cbb0d7..26ec6272 100644
--- a/portal/managementtabrequests.py
+++ b/portal/managementtabrequests.py
@@ -94,7 +94,7 @@ class ManagementRequestsView (LoginRequiredView, ThemeView):
 
             # ** Where am I a PI **
             # For this we need to ask SFA (of all authorities) = PI function
-            pi_authorities_query = Query.get('user').filter_by('user_hrn', '==', '$user_hrn').select('pi_authorities')
+            pi_authorities_query = Query.get('myslice:user').filter_by('user_hrn', '==', '$user_hrn').select('pi_authorities')
             pi_authorities_tmp = execute_query(self.request, pi_authorities_query)
             pi_authorities = set()
             try:
diff --git a/portal/slicerequestview.py b/portal/slicerequestview.py
index e6683bd4..4a52560c 100644
--- a/portal/slicerequestview.py
+++ b/portal/slicerequestview.py
@@ -126,7 +126,7 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
             slice_name = slice_request['slice_name']
             req_slice_hrn = authority_hrn + '.' + slice_name
             # comparing requested slice_hrn with the existing slice_hrn 
-            slice_query  = Query().get('slice').select('slice_hrn','parent_authority').filter_by('parent_authority','==',authority_hrn)
+            slice_query  = Query().get('myslice:slice').select('slice_hrn','parent_authority').filter_by('parent_authority','==',authority_hrn)
             slice_details_sfa = execute_admin_query(wsgi_request, slice_query)
             for _slice in slice_details_sfa:
                 if _slice['slice_hrn'] == req_slice_hrn:
diff --git a/portal/templates/base.html b/portal/templates/base.html
index df8fd9c1..6b7ea7e6 100644
--- a/portal/templates/base.html
+++ b/portal/templates/base.html
@@ -52,10 +52,9 @@ $(document).ready(function() {
     myslice.login();
 
     user = myslice.user();
-    
     var slices = [];
     if($.isEmptyObject(user)){
-        $.post("/rest/user/",{'filters':{'user_hrn':'$user_hrn'}}, function( data ) {
+        $.post("/rest/myslice:user/",{'filters':{'user_hrn':'$user_hrn'}}, function( data ) {
             if(data.length > 0){
                 drawSlices(data[0].slices);  
             }else{
@@ -69,14 +68,14 @@ $(document).ready(function() {
         slices = user.slices;
         drawSlices(slices);
     }
+    $.each( slices, function(i, val) {
+        console.log(val);
+        /*
+        Launch a Query for each slice to get resources and leases in Manifold Cache
+        $.post("/rest/slice/", { 'fields': ['slice_hrn','slice_urn','resource','lease','resource.urn','resource.hostname','resource.type','resource.facility_name','resource.testbed_name','lease.resource','lease.start_time','lease.end_time','lease.lease_id'], 'filters': { 'slice_hrn' : val } }, function(data) {
+        });
 
-    /*
-        Launch queries to get the resources and leases in Manifold Cache
-    */
-        
-    $.post("/rest/resource/", function( data ) {
-    });
-    $.post("/rest/lease/", function( data ) {
+        */
     });
 
    
@@ -85,11 +84,6 @@ $(document).ready(function() {
 		
         $.each( slices, function(i, val) {
             items.push( "<li><a href=\"/resources/"+val+"\">" + val + "</a></li>" );
-            /*
-            Launch a Query for each slice to get resources and leases in Manifold Cache
-            */
-            $.post("/rest/slice/", { 'filters': { 'slice_hrn' : val } }, function(data) {
-            });
         });
         $("div#home-slice-list").html($( "<ul/>", { html: items.join( "" ) }));
         $("ul#dropdown-slice-list").append(items.join( "" ));
diff --git a/portal/templates/fed4fire/fed4fire_institution.html b/portal/templates/fed4fire/fed4fire_institution.html
index bd361de2..8e2afbb6 100644
--- a/portal/templates/fed4fire/fed4fire_institution.html
+++ b/portal/templates/fed4fire/fed4fire_institution.html
@@ -92,7 +92,7 @@ $(document).ready(function() {
     {% if person %}
     {% if user_details.parent_authority %}
 
-        $.post("/rest/slice/",{'fields':['slice_hrn','users','url','slice_date_created'],'filters':{'parent_authority':'{{user_details.parent_authority}}'}}, function( data ) {
+        $.post("/rest/myslice:slice/",{'fields':['slice_hrn','users','url','slice_date_created'],'filters':{'parent_authority':'{{user_details.parent_authority}}'}}, function( data ) {
             var list_slices = [];
             var table_slices = [];
             /* "slice_hrn", "slice_description", "slice_type", "parent_authority", "created", "nodes", "slice_url", "slice_last_updated", "users", "slice_urn", "slice_expires" */
diff --git a/portal/templates/institution.html b/portal/templates/institution.html
index c627e5b3..e2a95ca0 100644
--- a/portal/templates/institution.html
+++ b/portal/templates/institution.html
@@ -97,7 +97,7 @@ $(document).ready(function() {
             $("div#authority-tab-loading").css("display","none");
          });
 
-        $.post("/rest/slice/",{'filters':{'parent_authority':'{{user_details.parent_authority}}'}}, function( data ) {
+        $.post("/rest/myslice:slice/",{'filters':{'parent_authority':'{{user_details.parent_authority}}'}}, function( data ) {
             var list_slices = [];
             var table_slices = [];
             /* "slice_hrn", "slice_description", "slice_type", "parent_authority", "created", "nodes", "slice_url", "slice_last_updated", "users", "slice_urn", "slice_expires" */