From: Loic Baron <loic.baron@lip6.fr>
Date: Fri, 16 Jan 2015 14:07:57 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.3~117^2~1
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=52a0b9984635eab3576e652a3a55c7bb15f564d6

Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

Conflicts:
	portal/templates/base.html
---

52a0b9984635eab3576e652a3a55c7bb15f564d6
diff --cc portal/managementtabrequests.py
index 26ec6272,7c0b222e..dcbe8a0f
--- a/portal/managementtabrequests.py
+++ b/portal/managementtabrequests.py
@@@ -88,13 -85,9 +85,9 @@@ class ManagementRequestsView (LoginRequ
                      for authority_hrn, credential in config['delegated_authority_credentials'].items():
                          credential_authorities.add(authority_hrn)
  
-             print 'credential_authorities =', credential_authorities
-             print 'credential_authorities_expired =', credential_authorities_expired
- 
              # ** 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 --cc portal/templates/base.html
index 6b7ea7e6,cc60f7f1..0bf9ab4e
--- a/portal/templates/base.html
+++ b/portal/templates/base.html
@@@ -52,6 -52,7 +52,7 @@@ $(document).ready(function() 
      myslice.login();
  
      user = myslice.user();
 -    
++
      var slices = [];
      if($.isEmptyObject(user)){
          $.post("/rest/myslice:user/",{'filters':{'user_hrn':'$user_hrn'}}, function( data ) {
@@@ -68,17 -69,11 +69,11 @@@
          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
+     */
+         
      function drawSlices(slices){
          var items = [];