X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Fslice-tab-users-view.html;h=d64fdee8ed92fb3e0d0d06452403ece0ac160755;hb=eae0d6c8743dfdc653efb1517a549d82b9776c67;hp=1aaea71044af9a93d3b9dc300bec9f0b1e0c0d61;hpb=dcb5961dffafd4a24a212decaf47548865e02f48;p=myslice.git

diff --git a/portal/templates/slice-tab-users-view.html b/portal/templates/slice-tab-users-view.html
index 1aaea710..d64fdee8 100644
--- a/portal/templates/slice-tab-users-view.html
+++ b/portal/templates/slice-tab-users-view.html
@@ -4,10 +4,12 @@
 <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 = [];
-    	$.post("/rest/user/",{'filters':{'parent_authority': authority_hrn}}, function( data ) {
+     	var slice_users = [];
+    	var slice_users_removed = [];
+ 	  	var slice_users_emails = [];
+    	var slice_users_emails_removed = [];
+    	$.post("/rest/myslice:user/",{'filters':{'parent_authority': authority_hrn}}, function( data ) {
         	var list_users = [];
         	var table_users = [];
     		/* Available fields
@@ -43,17 +45,30 @@
         	$("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
 
 	 	$('button#addusers').click(function() {
-     		$.post("/update/slice/",{'filters':{'slice_hrn':'{{slice}}'},'params':{'users':slice_users}}, function(data) {
+     		$.post("/update/myslice:slice/",{'filters':{'slice_hrn':'{{slice}}'},'params':{'users':slice_users}}, function(data) {
          		if(data.success){
              		// TODO: highlight row after success
              		//$('tr[id="'+record_id+'"]').highlight();
@@ -62,16 +77,17 @@
              		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
 
     $(document).ready(function() {
             // TODO: Add a filter based on the list of authorities
-        	$.post("/rest/authority/",{'fields':['authority_hrn']}, function( data ) {
+        	$.post("/rest/myslice:authority/",{'fields':['authority_hrn']}, function( data ) {
                 var list_authorities = [];
                 $.each( data, function( key, val ) {
                     auth_hrn = val.authority_hrn;
@@ -122,11 +138,6 @@
         	<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>