X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.ria%2Fsrc%2Fargeo-ria-lib%2Fsecurity%2Fclass%2Forg%2Fargeo%2Fsecurity%2Fria%2FUsersApplet.js;h=6a00e787cdcb9d2b82db3826169e907063761cc2;hb=f7c73e12f9534b0b796686e207dd4b43193977fa;hp=9438113ffe9df51dc29ea7e184eb2d931777b658;hpb=e80be147bdb65aa2a0c34e848ca78851b781508d;p=lgpl%2Fargeo-commons.git

diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UsersApplet.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UsersApplet.js
index 9438113ff..6a00e787c 100644
--- a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UsersApplet.js
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UsersApplet.js
@@ -28,6 +28,18 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
   	 */
   	commands : {
   		init : {
+  			"load_users" : {
+  				label 		: "Reload Users",
+  				icon 		: "org.argeo.security.ria/view-refresh.png",
+  				shortcut	: "Control+h",
+  				enabled 	: true,
+  				menu		: "Users",
+  				toolbar		: "users",
+  				callback	: function(e){
+  					this.loadUsersList();
+  				},
+  				command		: null
+  			},
   			"new_user" : {
   				label	 	: "New User", 
   				icon 		: "org.argeo.security.ria/list-add.png",
@@ -98,8 +110,13 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
   	},
   	usersList : {
   		check : "Map",
+  		apply : "_applyUsersList",
   		event : "changeUsersList"
   	},
+  	rolesList : {
+  		check : "Array",
+  		event : "changeRolesList"
+  	},
   	instanceId : {init:""},
   	instanceLabel : {init:""}
   },
@@ -114,7 +131,6 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
   		this.setView(viewPane);
   		this.setViewSelection(new org.argeo.ria.components.ViewSelection(viewPane.getViewId()));
   		
-  		this.setUsersList({});
   		this.toolBar = new qx.ui.toolbar.ToolBar();
   		this.toolBarPart = new qx.ui.toolbar.Part();
   		this.toolBar.add(this.toolBarPart);  		
@@ -138,9 +154,8 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
 		this.table.addListener("cellDblclick", function(cellEvent){
 			this.getCommands()["edit_user"].command.execute();
 		}, this);
-  		this.addListener("changeUsersList", function(){
-			this._updateTableModel();  		
-  		}, this);
+		
+  		this.setUsersList({});		
   		this.setGuiMode("clear");
   	},
   	
@@ -188,7 +203,10 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
   		this.toolBarPart.add(commands["delete_user"].command.getToolbarButton());
   		this.toolBarPart.add(commands["edit_user"].command.getToolbarButton());  		
   		this.toolBar.setShow("icon");
-
+		this.loadUsersList();
+  	},
+  	
+  	loadUsersList : function(){
   		var request = org.argeo.security.ria.SecurityAPI.getListUsersService();
   		request.addListener("completed", function(response){
   			var jSon = response.getContent();
@@ -200,29 +218,33 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
   			}
   			this.setUsersList(usMap);  			
   		}, this);
-  		request.send();
+  		request.send();  		
   	},
   	
-  	_updateTableModel : function(){
-  		var usList = this.getUsersList();
+  	_applyUsersList : function(usList){
   		var data = [];
+  		var rolesList = [];
   		qx.lang.Object.getValues(usList).forEach(function(usObject){
+  			var roles = usObject.getRoles();
+  			rolesList = qx.lang.Array.unique(rolesList.concat(roles));
   			data.push([usObject.getName(), usObject.getRoles().join(",")]);
   		});
+  		this.setRolesList(rolesList);
   		this.tableModel.setData(data);  		  		
   	},
-  	
-  	applySelection : function(selectionValues, target){
+  	  	
+  	applySelection : function(selectionValue, target, ignoreCase){
   		var selectionModel = this.table.getSelectionModel();  		
   		selectionModel.clearSelection();
-  		if(!selectionValues){
+  		if(!selectionValue){
   			return;
   		}
   		selectionModel.setBatchMode(true);
   		var data = this.tableModel.getData();
   		for(var i=0;i<this.tableModel.getRowCount();i++){
   			var value = this.tableModel.getRowDataAsMap(i)[target];
-  			if(qx.lang.Array.contains(selectionValues, value)){
+  			var pattern = new RegExp(selectionValue, "g"+(ignoreCase?"i":""));
+  			if(pattern.test(value)){
   				selectionModel.addSelectionInterval(i, i);
   			}
   		}