X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Forg.argeo.slc.ria%2Fsrc%2Fargeo-ria-lib%2Fslc%2Fclass%2Forg%2Fargeo%2Fslc%2Fria%2Fexecution%2FValue.js;h=34152e58e434142098d57653e66e1657d5e974d3;hb=10582f06c4addab75517c35a2d1848e58ecaa073;hp=b5944a019ab09ac17b5d7309ecaa5ebdf1c9358d;hpb=d8e9131cdd34b663a03008df8eb97616694259ce;p=gpl%2Fargeo-slc.git

diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/Value.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/Value.js
index b5944a019..34152e58e 100644
--- a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/Value.js
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/Value.js
@@ -55,6 +55,9 @@ qx.Class.define("org.argeo.slc.ria.execution.Value", {
 		 */
 		xmlSpecNode : {
 			apply : "_applyXmlSpecNode"
+		},
+		refList : {
+			check : "Array"
 		}
 	},
 	
@@ -63,7 +66,7 @@ qx.Class.define("org.argeo.slc.ria.execution.Value", {
 	},
 	
 	construct : function(){
-		this.base(arguments);
+		this.base(arguments);		
 	},
 	
 	members : {		
@@ -79,13 +82,22 @@ qx.Class.define("org.argeo.slc.ria.execution.Value", {
 				if(child.nodeType != 1) continue;
 				if(child.nodeName == "slc:primitive-spec-attribute"){
 					this.setSpecType("primitive");
-					this.setSpecSubType(org.argeo.ria.util.Element.getSingleNodeText(child, "@type"));
+					this.setSpecSubType(org.argeo.ria.util.Element.getSingleNodeText(child, "@type")||"");
 					if(org.argeo.ria.util.Element.getSingleNodeText(child, ".")){
 						this.setValue(org.argeo.ria.util.Element.getSingleNodeText(child, "."));
 					}
 				}else if(child.nodeName == "slc:ref-spec-attribute"){
 					this.setSpecType("ref");
-					this.setSpecSubType(org.argeo.ria.util.Element.getSingleNodeText(child, "@targetClassName"));
+					this.setSpecSubType(org.argeo.ria.util.Element.getSingleNodeText(child, "@targetClassName")||"");
+					var choices = org.argeo.ria.util.Element.selectNodes(child, "slc:choices/slc:ref-value-choice");
+					var refList = []; 
+					for(var k=0;k<choices.length;k++){
+						var choice = choices[k];
+						var name = org.argeo.ria.util.Element.getSingleNodeText(choice, "@name");
+						var description = org.argeo.ria.util.Element.getSingleNodeText(choice, "slc:description");
+						refList.push([name, (description||"")]);
+					}
+					this.setRefList(refList);
 				}
 				this.set({
 					parameter : (org.argeo.ria.util.Element.getSingleNodeText(child, "@isParameter")=="true"?true:false),
@@ -94,24 +106,7 @@ qx.Class.define("org.argeo.slc.ria.execution.Value", {
 				});				
 			}
 		},
-				
-		/**
-		 * Create an XML Representation of this value
-		 * @return {String} The XML String
-		 */
-		toAttributeXml : function(){
-			var valueTag = '';
-			var specAttribute = '';
-			if(this.getSpecType() == "primitive"){
-				valueTag =  (this.getValue()?this.getValue():'');
-				specAttribute = '<slc:primitive-spec-attribute isParameter="'+(this.getParameter()?"true":"false")+'" isFrozen="'+(this.getFrozen()?"true":"false")+'" isHidden="'+(this.getHidden()?"true":"false")+'" type="'+this.getSpecSubType()+'">'+valueTag+'</slc:primitive-spec-attribute>';
-			}else if(this.getSpecType() == "ref"){
-				valueTag = (this.getValue()?'<slc:label>'+this.getValue()+'</slc:label>':'');
-				specAttribute = '<slc:ref-spec-attribute isParameter="'+(this.getParameter()?"true":"false")+'" isFrozen="'+(this.getFrozen()?"true":"false")+'" isHidden="'+(this.getHidden()?"true":"false")+'" targetClassName="'+this.getSpecSubType()+'">'+valueTag+'</slc:ref-spec-attribute>';
-			}
-			return '<slc:value key="'+this.getKey()+'">'+specAttribute+'</slc:value>';
-		},
-		
+						
 		toValueXml : function(){
 			var valueTag = '';
 			var specAttribute = '';
@@ -119,8 +114,7 @@ qx.Class.define("org.argeo.slc.ria.execution.Value", {
 				valueTag =  this.getValue();
 				specAttribute = '<slc:primitive-value type="'+this.getSpecSubType()+'">'+valueTag+'</slc:primitive-value>';
 			}else if(this.getSpecType() == "ref"){
-				valueTag = '<slc:label>'+this.getValue()+'</slc:label>';
-				specAttribute = '<slc:ref-value >'+valueTag+'</slc:ref-value>';
+				specAttribute = '<slc:ref-value ref="'+this.getValue()+'" type="beanName" />';
 			}
 			return '<slc:value key="'+this.getKey()+'">'+specAttribute+'</slc:value>';			
 		}