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

[unfold.git] / portal / static / js / myslice.js

diff --git a/portal/static/js/myslice.js b/portal/static/js/myslice.js
index 4b8fc83..548d5da 100644 (file)
--- a/portal/static/js/myslice.js
+++ b/portal/static/js/myslice.js
@@ -172,10 +172,35 @@ var myslice = {
         if($.isEmptyObject(user)){
             // REGISTRY ONLY TO BE REMOVED WITH MANIFOLD-V2
                    $.post("/rest/myslice:user/",{'filters':{'user_hrn':'$user_hrn'}}, function( data ) {
-                           localStorage.setItem('user', JSON.stringify(data[0]));
-                myslice.loadSlices(data[0].slices);
-                if(isFunction(fn)){
-                    fn();
+                       if (data.length > 0) {
+                           localStorage.setItem('user', JSON.stringify(data[0]));
+                    projects = [];
+                           $.each(data[0].pi_authorities, function(idx, auth) {
+                        // PI on projects
+                        if(auth.split('.').length>2){
+                            if($.inArray(auth,projects) == -1){
+                                projects.push(auth);
+                            }
+                        }else if (auth.split('.').length>1){
+                        // PI on authorities
+                            // What are the projects under this authority?
+                            $.post("/rest/myslice:authority/",{'fields':['authority_hrn'],'filters':{'authority_hrn':'CONTAINS'+auth}}, function( data ) {
+                                       $.each(data, function(idx, project) {
+                                    console.log(project.authority_hrn);
+                                    if($.inArray(project.authority_hrn,projects) == -1){
+                                        projects.push(project.authority_hrn);
+                                    }
+                                });
+                            });
+                        }else{
+                            console.log("admin account - we don't list all from root");
+                        }
+                    });
+                    localStorage.setItem('projects', JSON.stringify(projects));
+                    myslice.loadSlices(data[0].slices);
+                    if(isFunction(fn)){
+                        fn();
+                    }
                 }
                    });
         }else{
@@ -185,29 +210,7 @@ var myslice = {
         }
 
        },
-       loadProjects: function(fn) {
-        user = JSON.parse(localStorage.getItem('user'));
-        projects = localStorage.getItem('projects');
-        if($.isEmptyObject(projects)){
-            if($.isEmptyObject(user) || $.isEmptyObject(user.parent_authority)){
-                       $.post("/rest/myslice:user/",{'filters':{'user_hrn':'$user_hrn'},'fields':['parent_authority']}, function( data ) {
-                    parent_authority = data[0].parent_authority;
 
-                });
-            }else{
-                parent_authority = user.parent_authority;
-            }
-            // REGISTRY ONLY TO BE REMOVED WITH MANIFOLD-V2
-            $.post("/rest/authority/",{'fields':['authority_hrn'],'filters':{'authority_hrn':'CONTAINS'+parent_authority}}, function( data ) {
-                localStorage.setItem('projects', JSON.stringify(data));
-            });
-        }else{
-            if(isFunction(fn)){
-                fn();
-            }
-        }
-
-       },
 
     getSlices: function(name) {