X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.ria%2Fsrc%2Fargeo-ria-lib%2Fsecurity%2Fclass%2Forg%2Fargeo%2Fsecurity%2Fria%2FRolesApplet.js;h=66d9fe9f36560d4226186364070af0cd4f0d2f44;hb=3112a8b93396eb3fb95fc8b1038a5dfb224d5006;hp=65b5427b30259fbe5dc1a968744151cbad0d73f1;hpb=1af54f2dad396ac71d9872d82c2981e4ac9c2281;p=lgpl%2Fargeo-commons.git

diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/RolesApplet.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/RolesApplet.js
index 65b5427b3..66d9fe9f3 100644
--- a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/RolesApplet.js
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/RolesApplet.js
@@ -28,10 +28,22 @@ qx.Class.define("org.argeo.security.ria.RolesApplet",
   	 */
   	commands : {
   		init : {
+  			"reload" : {
+  				label 		: "Reload Data",
+  				icon 		: "org.argeo.security.ria/view-refresh.png",
+  				shortcut	: "Control+h",
+  				enabled 	: true,
+  				menu		: "Roles",
+  				toolbar		: "roles",
+  				callback	: function(e){
+  					this.loadRolesList();
+  				},
+  				command		: null
+  			},  			
   			"new_role" : {
   				label	 	: "Create Role", 
   				icon 		: "org.argeo.security.ria/list-add.png",
-  				shortcut 	: "Control+n",
+  				shortcut 	: null,
   				enabled  	: true,
   				menu	   	: "Roles",
   				toolbar  	: null,
@@ -52,20 +64,25 @@ qx.Class.define("org.argeo.security.ria.RolesApplet",
   			"delete_role" : {
   				label	 	: "Delete Role", 
   				icon 		: "org.argeo.security.ria/list-remove.png",
-  				shortcut 	: "Control+s",
+  				shortcut 	: null,
   				enabled  	: true,
   				menu	   	: "Roles",
   				toolbar  	: null,
   				callback	: function(e){
   					// Call service to delete
 					var roles = this.getViewSelection().getNodes();
-					for(var i=0;i<roles.length;i++){
-  						var service = org.argeo.security.ria.SecurityAPI.getDeleteRoleService(roles[i]);
-  						service.addListener("completed", function(response){
-  							this.loadRolesList();
-  						}, this);
-  						service.send();
-					}
+					var modal = new org.argeo.ria.components.Modal("Delete");					
+					modal.addConfirm("Are you sure you want to delete the selected roles?");
+					modal.addListener("ok", function(e){
+						for(var i=0;i<roles.length;i++){
+	  						var service = org.argeo.security.ria.SecurityAPI.getDeleteRoleService(roles[i]);
+	  						service.addListener("completed", function(response){
+	  							this.loadRolesList();
+	  						}, this);
+	  						service.send();
+						}
+					}, this);
+					modal.attachAndShow();					
   				},
   				selectionChange : function(viewName, data){
   					if(viewName != "roles") return;
@@ -153,7 +170,7 @@ qx.Class.define("org.argeo.security.ria.RolesApplet",
   		});
   		  		
   		// TOGGLE THE GUI MODES  		
-  		this.toggleButton.addListener("changeChecked", function(event){
+  		this.toggleButton.addListener("changeValue", function(event){
   			this.setGuiMode(event.getData()?"filter":"clear");
   		}, this);
 		
@@ -227,7 +244,13 @@ qx.Class.define("org.argeo.security.ria.RolesApplet",
 				viewSel.removeListener("changeSelection", this.monitorChooserSelectionChanges, this);			
 			}
 			selectionModel.addListener("changeSelection", this.selectionToFilter, this);
+			if(selectionModel.getSelectedCount()){
+				var orig = selectionModel.getSelectedRanges()[0].minIndex;
+			}
 			selectionModel.setSelectionMode(qx.ui.table.selection.Model.MULTIPLE_INTERVAL_SELECTION_TOGGLE);
+			if(orig){
+				selectionModel.addSelectionInterval(orig, orig);
+			}
 			this.selectionToFilter();  			
   		}else if(guiMode == "edit"){
 			if(!this.usersAppletReference) return;
@@ -248,13 +271,17 @@ qx.Class.define("org.argeo.security.ria.RolesApplet",
 			}
 			this.table.setEnabled(true);
 			selectionModel.removeListener("changeSelection", this.selectionToFilter, this);
+			if(selectionModel.getSelectedCount()){
+				var orig = selectionModel.getSelectedRanges()[0].minIndex;
+			}
 			selectionModel.setSelectionMode(qx.ui.table.selection.Model.SINGLE_SELECTION);  			
+			if(orig){
+				selectionModel.addSelectionInterval(orig, orig);
+			}
   		}
   	},
   	
   	saveRoleModifications : function(deltaPlus, deltaMinus){
-  		//console.log(deltaPlus);
-  		//console.log(deltaMinus);
   		// LOAD CONCERNED USERS
   		var selectionModel = this.table.getSelectionModel();
 		if(!selectionModel.getSelectedCount()){
@@ -263,6 +290,8 @@ qx.Class.define("org.argeo.security.ria.RolesApplet",
 		var roleValue = this._selectionToValues(selectionModel)[0];
   		
   		var users = deltaPlus.concat(deltaMinus);
+  		var modal = new org.argeo.ria.components.Modal("Batch Update", "", "Please wait, updating roles for selected users");
+  		modal.attachAndShow();
   		for(var i=0;i<users.length;i++){
   			var user = users[i];
   			var userDetailService = org.argeo.security.ria.SecurityAPI.getUserDetailsService(users[i]);
@@ -274,13 +303,15 @@ qx.Class.define("org.argeo.security.ria.RolesApplet",
   					qx.lang.Array.remove(userRoles, roleValue);
   				}
   				var userSaveService = org.argeo.security.ria.SecurityAPI.getUpdateUserService(response.getContent());
-  				userSaveService.addListener("completed", function(e){
-  					this.fireDataEvent("changeRolesList", this.getRolesList());
-  				}, this);
+  				userSaveService.setAsynchronous(false);
   				userSaveService.send();
   			}, this);
+  			userDetailService.setAsynchronous(false);
   			userDetailService.send();
   		}
+  		this.fireDataEvent("changeRolesList", this.getRolesList());
+  		modal.hide();
+  		modal.destroy();
   	},
   	
   	monitorChooserSelectionChanges : function(event){