X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.slc.webapp%2Fsrc%2Fmain%2Fwebapp%2Fargeo-ria-lib%2Fslc%2Fclass%2Forg%2Fargeo%2Fslc%2Fria%2Fexecution%2FFlow.js;h=017599ee6f2ce64999faf001ef5449a81458d9e4;hb=68ed7317e5fefb71258b552c1fb2ccd1c1f8cbc5;hp=10473aa5ca037590e906ff24708e9c830dc4c018;hpb=e3ae72208feba2b542520878574d49ac16917573;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/Flow.js b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/Flow.js
index 10473aa5c..017599ee6 100644
--- a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/Flow.js
+++ b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/Flow.js
@@ -13,6 +13,13 @@ qx.Class.define("org.argeo.slc.ria.execution.Flow", {
 			check : "String",
 			init : ""
 		},
+		/**
+		 * An optional path describing this flow
+		 */
+		path : {
+			check : "String",
+			nullable : true
+		},
 		/**
 		 * Name of the associated spec, to be found in the module 
 		 */
@@ -51,7 +58,11 @@ qx.Class.define("org.argeo.slc.ria.execution.Flow", {
 		/**
 		 * XPath to the values
 		 */
-		XPATH_VALUES : "slc:values"
+		XPATH_VALUES : "slc:values",
+		/**
+		 * An optional hierarchical path
+		 */
+		XPATH_PATH : "@path"
 	},
 	
 	construct : function(){
@@ -66,6 +77,7 @@ qx.Class.define("org.argeo.slc.ria.execution.Flow", {
 		_applyXmlNode : function(xmlNode){
 			this.set({
 				name : org.argeo.ria.util.Element.getSingleNodeText(xmlNode, this.self(arguments).XPATH_NAME),
+				path : org.argeo.ria.util.Element.getSingleNodeText(xmlNode, this.self(arguments).XPATH_PATH),
 				executionSpecName : org.argeo.ria.util.Element.getSingleNodeText(xmlNode, this.self(arguments).XPATH_EXEC_SPEC_NAME)
 			});
 			var values = org.argeo.ria.util.Element.selectNodes(xmlNode, this.self(arguments).XPATH_VALUES);
@@ -81,7 +93,7 @@ qx.Class.define("org.argeo.slc.ria.execution.Flow", {
 		getValue: function(key, specType, specSubType){
 			var xpath;
 			if(specType == "primitive"){
-				xpath = 'slc:value[@key="'+key+'"]/slc:primitive-value[@type="'+specSubType+'"]/slc:value';
+				xpath = 'slc:value[@key="'+key+'"]/slc:primitive-value[@type="'+specSubType+'"]';
 			}else if(specType == "ref"){
 				xpath = 'slc:value[@key="'+key+'"]/slc:ref-value/slc:label';
 			}