From: Charles du Jeu Date: Thu, 8 Apr 2010 08:13:36 +0000 (+0000) Subject: Check if the flow name contains slashes and if not path is set, and use the name... X-Git-Tag: argeo-slc-2.1.7~1383 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=bf8e1e07e652e0838e7444d890b4b1a44ae70a24;p=gpl%2Fargeo-slc.git Check if the flow name contains slashes and if not path is set, and use the name as a path in this case. git-svn-id: https://svn.argeo.org/slc/trunk@3442 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/FlowsSelectorView.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/FlowsSelectorView.js index a6d7c78d6..d15b71a1d 100644 --- a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/FlowsSelectorView.js +++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/FlowsSelectorView.js @@ -374,12 +374,24 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", { } var execFlows = executionModule.getExecutionFlows(); for (var key in execFlows) { - var file = new qx.ui.tree.TreeFile(key); + var path = execFlows[key].getPath(); + var name = execFlows[key].getName(); + var nodeLabel = key; + var sep = "\/"; + if(name && name.indexOf(sep)>-1 && !path){ + // Use given name to build the path. + // split dirname and basename + var parts = name.split(sep); + var basename = parts.pop(); + var dirname = parts.join("/"); + path = dirname; + nodeLabel = basename; + } + var file = new qx.ui.tree.TreeFile(nodeLabel); if(execFlows[key].getDescription() != ""){ org.argeo.slc.ria.FlowsSelectorView.attachToolTip(file, execFlows[key].getDescription()); } file.setIcon("org.argeo.slc.ria/system.png"); - var path = execFlows[key].getPath(); file.setUserData("executionModule", executionModule); file.setUserData("executionFlow", execFlows[key]); file.setUserData("agentUuid", agentUuid);