Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre
authorLoic Baron <loic.baron@lip6.fr>
Fri, 25 Jul 2014 18:23:57 +0000 (15:23 -0300)
committerLoic Baron <loic.baron@lip6.fr>
Fri, 25 Jul 2014 18:23:57 +0000 (15:23 -0300)
1  2 
portal/templates/slice-tab-users-view.html

@@@ -4,8 -4,12 +4,11 @@@
  <link rel="stylesheet" href="{{ STATIC_URL }}css/jquery-ui.css">
  <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 = [];
+       var slice_users = [];
+       var slice_users_removed = [];
+               var slice_users_emails = [];
+       var slice_users_emails_removed = [];
        $.post("/rest/user/",{'filters':{'parent_authority': authority_hrn}}, function( data ) {
                var list_users = [];
                var table_users = [];
                $("div#user-tab-loading").css("display","none");
              $("input:checkbox.user").click(function() {
                  user_hrn = $(this).closest('tr').find('td:eq(2)').html();
+                 user_email = $(this).closest('tr').find('td:eq(1)').html();
                  if(this.checked){
                      var record_id = this.id;
                      slice_users.push (user_hrn);
+                                       slice_users_removed.splice($.inArray(user_hrn, slice_users_removed),1);
+                     slice_users_emails.push (user_email);
+                                       slice_users_emails_removed.splice($.inArray(user_email, slice_users_emails_removed),1); 
+       
                  }else{
-                     console.log(slice_users);
+                     slice_users_removed.push (user_hrn);
+                                       slice_users.splice($.inArray(user_hrn, slice_users),1);
+                     slice_users_emails_removed.push (user_email);
+                                       // this one is removing from the list wrong user when u uncheck
+                                       //slice_users_emails.splice($.inArray(user_email, slice_users_emails),1);
+                                       //this one is still buggy cz it still keeps users in both arrays
+                                       // but it's ok for the moment
+                                       slice_users_emails;
+       
                  }
              });
        }); // post rest/use
                        mysliceAlert('Rest Error for: '+data.error,'warning', true);
                        }
                }); // post update slice
-  
-               // TODO: refresh table
-               //window.location="/portal/institution#slices";
+                       emails = slice_users_emails.concat(slice_users_emails_removed);
+               $.post("/credentials/clear/",{'emails':emails}, function(data) {
+               }); // post credentials clear
                }); // button#addusers click
  
      } // get_users_in_slice
                  $.each( data, function( key, val ) {
                      auth_hrn = val.authority_hrn;
                      // Keep only the sub authorities, remove root auth
 -                    if(auth_hrn.indexOf(".") > -1){
 +                    //if(auth_hrn.indexOf(".") > -1){
                          list_authorities.push(auth_hrn);
                                                list_authorities.sort();
                          if(auth_hrn=="{{user_details.parent_authority}}"){
                                                        $('#auth_list').val(auth_hrn);
                                                }
 -                    }
 +                    //}
                  });
                                $( "#auth_list" ).autocomplete({
                                        source: list_authorities,