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

diff --git a/portal/templates/institution.html b/portal/templates/institution.html
index 1731221..ca9fe5a 100644 (file)
--- a/portal/templates/institution.html
+++ b/portal/templates/institution.html
@@ -165,8 +165,9 @@
         $.post("/rest/user/",{'filters':{'parent_authority':'{{user_details.parent_authority}}'}}, function( data ) {
             var list_users = [];
             var table_users = [];
-                       /*
-                       "enabled", "keys", "parent_authority", "user_first_name", "user_last_name", "user_phone", "user_hrn", "slice", "user_email"
+                       /* Available fields
+                       user_gid, user_enabled, slices, pi_authorities, keys, parent_authority, user_first_name,
+                       user_urn, user_last_name, user_phone, user_hrn, user_email, user_type
                        */
             $.each( data, function( key, val ) {
                 list_users.push( "<li><a href=\"portal/user/"+val.user_email+"\">" + val.user_email + "</a></li>" );
@@ -177,7 +178,7 @@
                 user_row += "<td>"+val.user_hrn+"</td>";
                 user_row += "<td>"+val.user_first_name+"</td>";
                 user_row += "<td>"+val.user_last_name+"</td>";
-                               user_row += "<td>"+val.enabled+"</td>";
+                               user_row += "<td>"+val.user_enabled+"</td>";
                 user_row += "</tr>";
                 table_users.push(user_row);
                 

diff --git a/portal/templates/onelab/onelab_slice-user-view.html b/portal/templates/onelab/onelab_slice-user-view.html
index 95e6925..d1c87e1 100644 (file)
--- a/portal/templates/onelab/onelab_slice-user-view.html
+++ b/portal/templates/onelab/onelab_slice-user-view.html
@@ -66,8 +66,9 @@
                $.post("/rest/user/",{'filters':{'parent_authority': "{{user_details.parent_authority}}"}}, function( data ) {
                var list_users = [];
                var table_users = [];
-                               /*
-                               "enabled", "keys", "parent_authority", "user_first_name", "user_last_name", "user_phone", "user_hrn", "slice", "user_email"
+                               /* Available fields
+                               user_gid, user_enabled, slices, pi_authorities, keys, parent_authority, user_first_name,
+                           user_urn, user_last_name, user_phone, user_hrn, user_email, user_type
                                */
                $.each( data, function( key, val ) {
                        list_users.push( "<li><a href=\"portal/user/"+val.user_email+"\">" + val.user_email + "</a></li>" );
@@ -87,7 +88,7 @@
                                        }
                        user_row += "<td>"+val.user_email+"</td>";
                        user_row += "<td>"+val.user_hrn+"</td>";
-                                       user_row += "<td>"+val.enabled+"</td>";
+                                       user_row += "<td>"+val.user_enabled+"</td>";
                        user_row += "</tr>";
                        table_users.push(user_row);