List of users with a filter on authority_hrn

diff --git a/portal/templates/slice-tab-users-view.html b/portal/templates/slice-tab-users-view.html
index f0cb9b0..1052c49 100644 (file)
--- a/portal/templates/slice-tab-users-view.html
+++ b/portal/templates/slice-tab-users-view.html
@@ -1,95 +1,74 @@
-       <div class="col-md-2">
-               <div id="select-platform" class="list-group">
-               </div>
-                       
-               <ul class="list-group">
-                 <li class="list-group-item">Authority:<b> {{user_details.parent_authority}}</b>
-                       <!--<select id="auth_list">
-                               <option value="ple.upmc">UPMC</option>
-                               <option value="ple.inria">INRIA</option>
-                               <option value="ple.nitos">NITOS</option>
-                               <option value="ple.iminds">iMinds</option>
-                       </select> -->
-                 </li>
-                 <li class="list-group-item">Filter: slice</li>
-                
-               </ul>
-       
-       </div>
-       <div class="col-md-10">
-               <div class="row">
-               </div>
-               <div id="user-tab-loading"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Useres" /></div>
-               <div id="user-tab-loaded" style="display:none;">
-               <table id="user-tab" class="table">
-                       <tr>
-                       <th>+/-</th>
-                       <th>Email</th>
-                       <th>User hrn</th>
-                       <th>Enabled</th>
-                       </tr>
-               </table>
-
-                <!-- XXX TODO: for the moment only PIs have access to Update but users that have slice credentials should also have access to that -->
-
-                               {% if 'is_pi'  in pi %}
-                               <button id="addusers" type="button" class="btn btn-default"><span class="glyphicon glyphicon-ok"></span> Update users</button>
-                               {%endif%}
-               </div>
 <script>
+    function get_users_in_slice(authority_hrn){
+        console.log(authority_hrn);
+        $("table#user-tab").html("<tr><th>+/-</th><th>Email</th><th>User hrn</th></tr>");
+       var slice_users = [];
+       $.post("/rest/user/",{'filters':{'parent_authority': authority_hrn}}, function( data ) {
+               var list_users = [];
+               var table_users = [];
+               /* 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>" );
+               user_row = "<tr>";
+                       // checking the box for the users that belong to the selected slice
+                       var flag_checkbox = 0;
+                       for(var data in val.slices) {
+                               var element = val.slices[data];
+                               if (element == "{{slice}}"){
+                                       //console.log("the slice is: "+ element);       
+                                       flag_checkbox = 1;
+                                       slice_users.push (val.user_hrn)
+                                       user_row += "<td><input type='checkbox' checked='True' class='user'></td>";
+                               }
+                       }
+                       if(flag_checkbox != 1){
+                       user_row += "<td><input type='checkbox' class='user'></td>";
+                       }
+               user_row += "<td>"+val.user_email+"</td>";
+               user_row += "<td>"+val.user_hrn+"</td>";
+                       //user_row += "<td>"+val.user_enabled+"</td>";
+               user_row += "</tr>";
+               table_users.push(user_row);
+            
+               });
+               $("table#user-tab tr:first").after(table_users.join( "" ));
+               $("div#user-tab-loaded").css("display","block");
+               $("div#user-tab-loading").css("display","none");
+            $("input:checkbox.user").click(function() {
+                user_hrn = $(this).closest('tr').find('td:eq(2)').html();
+                if(this.checked){
+                    var record_id = this.id;
+                    slice_users.push (user_hrn);
+                }else{
+                    console.log(slice_users);
+                }
+            });
+       }); // post rest/user
+    }
+
     $(document).ready(function() {
             // TODO: Add a filter based on the list of authorities
                $.post("/rest/authority/",{'fields':['authority_hrn']}, function( data ) {
-                console.log(data);
-            }); // post rest/authority
-
-                       var slice_users = [];
-               $.post("/rest/user/",{'filters':{'parent_authority': "{{user_details.parent_authority}}"}}, function( data ) {
-               var list_users = [];
-               var table_users = [];
-                               /* 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>" );
-                       user_row = "<tr>";
-                                       // checking the box for the users that belong to the selected slice
-                                       var flag_checkbox = 0;
-                                       for(var data in val.slices) {
-                                       var element = val.slices[data];
-                                               if (element == "{{slice}}"){
-                                                       //console.log("the slice is: "+ element);       
-                                                       flag_checkbox = 1;
-                                                       slice_users.push (val.user_hrn)
-                                                       user_row += "<td><input type='checkbox' checked='True' class='user'></td>";
-                                               }
-                                       }
-                                       if(flag_checkbox != 1){
-                               user_row += "<td><input type='checkbox' class='user'></td>";
-                                       }
-                       user_row += "<td>"+val.user_email+"</td>";
-                       user_row += "<td>"+val.user_hrn+"</td>";
-                                       user_row += "<td>"+val.user_enabled+"</td>";
-                       user_row += "</tr>";
-                       table_users.push(user_row);
-                
-               });
-            
-                               $("table#user-tab tr:last").after(table_users.join( "" ));
-               $("div#user-tab-loaded").css("display","block");
-               $("div#user-tab-loading").css("display","none");
-                $("input:checkbox.user").click(function() {
-                    user_hrn = $(this).closest('tr').find('td:eq(2)').html();
-                    if(this.checked){
-                        var record_id = this.id;
-                        slice_users.push (user_hrn);
-                    }else{
-                        console.log(slice_users);
+                var list_authorities = [];
+                $.each( data, function( key, val ) {
+                    auth_hrn = val.authority_hrn;
+                    // Keep only the sub authorities, remove root auth
+                    if(auth_hrn.indexOf(".") > -1){
+                        list_authorities.push(auth_hrn);
+                        if(auth_hrn=="{{user_details.parent_authority}}"){
+                            $("#auth_list").append("<option value='"+auth_hrn+"' selected='selected'>"+auth_hrn+"</option>");
+                        }else{
+                            $("#auth_list").append("<option value='"+auth_hrn+"'>"+auth_hrn+"</option>");
+                        }
                     }
                 });
-           
-               }); // post rest/user
+            }); // post rest/authority
+
+            get_users_in_slice("{{user_details.parent_authority}}");
+
                $('button#addusers').click(function() {
                 $.post("/update/slice/",{'filters':{'slice_hrn':'{{slice}}'},'params':{'users':slice_users}}, function(data) {
                        if(data.success){
@@ -109,3 +88,32 @@
     }); // document ready
 </script>
 
+       <div class="col-md-2">
+               <div id="select-platform" class="list-group">
+               </div>
+                       
+               <ul class="list-group">
+                 <li class="list-group-item">Authority:<b> {{user_details.parent_authority}}</b>
+                 </li>
+                 <li class="list-group-item" style="padding-left:5px;">
+                       <select id="auth_list" onchange="get_users_in_slice(this.value);" style ="min-width:190px;">
+            </select>
+          </li>
+               </ul>
+       
+       </div>
+       <div class="col-md-10">
+               <div class="row">
+               </div>
+               <div id="user-tab-loading"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Useres" /></div>
+               <div id="user-tab-loaded" style="display:none;">
+               <table id="user-tab" class="table">
+               </table>
+
+                <!-- XXX TODO: for the moment only PIs have access to Update but users that have slice credentials should also have access to that -->
+
+                               {% if 'is_pi'  in pi %}
+                               <button id="addusers" type="button" class="btn btn-default"><span class="glyphicon glyphicon-ok"></span> Update users</button>
+                               {%endif%}
+               </div>
+