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%2Fcomponents%2FSimpleUserNatureImpl.js;h=8f3b94c9000a8af843aae7b7c8fbe477f2464dd2;hb=9b6a0645e8e964fd7bb04a63ddebbf2f14bd7779;hp=342cee246bf91cae6891673a037d89ee42e48674;hpb=98c2719d08b7d1791eb2080b4488bba810044608;p=lgpl%2Fargeo-commons.git

diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/SimpleUserNatureImpl.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/SimpleUserNatureImpl.js
index 342cee246..8f3b94c90 100644
--- a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/SimpleUserNatureImpl.js
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/SimpleUserNatureImpl.js
@@ -7,7 +7,8 @@ qx.Class.define("org.argeo.security.ria.components.SimpleUserNatureImpl", {
 	statics : {
 		NATURE_TYPE : "org.argeo.security.nature.SimpleUserNature",
 		NATURE_LABEL : "Simple User",
-		NATURE_ICON : ""
+		NATURE_ICON : "",
+		NATURE_RANK	: 0		
 	},
 	properties : {
 		valid : {
@@ -20,11 +21,18 @@ qx.Class.define("org.argeo.security.ria.components.SimpleUserNatureImpl", {
 			init : true,
 			apply : "_applyEditMode",
 			event : "changeEditMode"
+		},
+		isNew	: {
+			init : false,
+			check : "Boolean"
 		}		
 	},
 	
 	construct : function(){
 		this.base(arguments);  	
+		this.setDataMap({
+			type:"org.argeo.security.nature.SimpleUserNature"
+		});
 		this._createGui();
  		this.setEditMode(false);		
 	},
@@ -41,12 +49,14 @@ qx.Class.define("org.argeo.security.ria.components.SimpleUserNatureImpl", {
 	  		this.mailField = new qx.ui.form.TextField();
 	  		this.fNameField = new qx.ui.form.TextField();
 	  		this.nameField = new qx.ui.form.TextField();
+	  		this.descriptionField = new qx.ui.form.TextArea();
 	  		
-	  		var labels = ["Email", "First Name", "Last Name"]; 
+	  		var labels = ["Email", "First Name", "Last Name", "Description"]; 
 	  		this.fields = {
 	  			"email" : this.mailField, 
 	  			"firstName": this.fNameField, 
-	  			"lastName" : this.nameField
+	  			"lastName" : this.nameField,
+	  			"description" : this.descriptionField
 	  		};
 	  		
 	  		for(var i=0;i<labels.length;i++){
@@ -62,7 +72,8 @@ qx.Class.define("org.argeo.security.ria.components.SimpleUserNatureImpl", {
 		
 		_applyEditMode : function(value){
 			for(var key in this.fields){
-				this.fields[key].setEnabled(value);
+				if(value && this.fields[key].getReadOnly && this.fields[key].getReadOnly()) continue;
+				this.fields[key].setEnabled(value);				
 			}
 		},
 		
@@ -72,15 +83,22 @@ qx.Class.define("org.argeo.security.ria.components.SimpleUserNatureImpl", {
 		setData    : function(dataMap, format){
 			for(var key in this.fields){
 				if(dataMap[key]){
-					this.fields[key].setValue(dataMap[key]);
+					if(qx.Class.hasInterface(qx.Class.getByName(this.fields[key].classname), qx.ui.form.IModelSelection)){
+						this.fields[key].setModelSelection([dataMap[key]]);
+					}else{
+						this.fields[key].setValue(dataMap[key]);
+					}
 				}
 			}
 			this.setDataMap(dataMap);
 		},
 		getData    : function(format){
 			var dataMap = this.getDataMap();
-			for(var key in dataMap){
-				if(this.fields[key]){
+			for(var key in this.fields){
+				if(qx.Class.hasInterface(qx.Class.getByName(this.fields[key].classname), qx.ui.form.IModelSelection)){
+					var sel = this.fields[key].getModelSelection();
+					if(sel && qx.lang.Type.isArray(sel)) dataMap[key] = sel[0];					
+				}else{
 					dataMap[key] = this.fields[key].getValue();
 				}
 			}