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%2FFlowsSelectorView.js;h=4d3494f50ebc69bba5285d8a9e3c825cfc15d92e;hb=f59509dd7a5d4aed1a1b4f8fae72883b3911b16b;hp=c9b3b108ba44786a7fa1a85356935aa30fbb393b;hpb=e0be1cede09ad3163fd389e327191cac8ccea575;p=gpl%2Fargeo-slc.git

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 c9b3b108b..4d3494f50 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
@@ -252,14 +252,12 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", {
 					agentFolder.setPersistentTreeID(folder.getPersistentTreeID()+"_"+uuid);
 					agentFolder.setUserData("agentHost", host); // Used by bookmark system
 					agentFolder.setUserData("agentUuid", uuid);
-					if(preferredHosts && preferredHosts instanceof Array && qx.lang.Array.contains(preferredHosts, uuid)){
+					if(preferredHosts && preferredHosts instanceof Array && qx.lang.Array.contains(preferredHosts, host)){
 						folder.addAtBegin(agentFolder);
 						agentFolder.setIcon("org.argeo.slc.ria/computer_bookmarked.png");
-						agentFolder.setUserData("preferredHost", true);
 					}else{
 						folder.add(agentFolder);
 						agentFolder.setIcon("org.argeo.slc.ria/computer.png");
-						agentFolder.setUserData("preferredHost", false);
 					}
 				}
 				if(newAgents){
@@ -318,7 +316,7 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", {
 					for (var i = 0; i < mods[key].length; i++) {
 						var module = mods[key][i];
 						var versionFolder = new org.argeo.ria.components.DynamicTreeFolder(
-								module.getDescription(), flowLoader,
+								module.getLabel(), flowLoader,
 								"Loading Flows", folder.getDragData());
 						versionFolder.setUserData("moduleData", {
 									name : key,
@@ -326,7 +324,8 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", {
 								});
 						versionFolder.setIcon("org.argeo.slc.ria/archive.png");
 						versionFolder.setUserData("agentUuid", agentId);
-						org.argeo.slc.ria.FlowsSelectorView.attachToolTip(versionFolder, key + ' (' + module.getVersion() + ')');
+						var sep = (module.getDescription()!=""?" - ":"");
+						org.argeo.slc.ria.FlowsSelectorView.attachToolTip(versionFolder, key + ' (' + module.getVersion() + ')'+sep+module.getDescription());
 						// Warning, we must add it AFTER setting the user data, 
 						// because of the persistent loading mechanism.
 						folder.add(versionFolder);
@@ -523,7 +522,7 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", {
 		 * @param agentNode {qx.ui.tree.AbstractTreeItem}
 		 */
 		togglePreferredHost : function(agentNode){
-			var hostName = agentNode.getUserData("agentUuid");
+			var hostName = agentNode.getUserData("agentHost");
 			var pref = this.getRiaPreferenceValue("flowSelector.preferred.hosts");
 			var prefArray = [];
 			if(pref){
@@ -532,11 +531,9 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", {
 			if(qx.lang.Array.contains(prefArray, hostName)){
 				qx.lang.Array.remove(prefArray, hostName);
 				agentNode.setIcon("org.argeo.slc.ria/computer.png");
-				agentFolder.setUserData("preferredHost", false);
 			}else{
 				prefArray.push(hostName);
 				agentNode.setIcon("org.argeo.slc.ria/computer_bookmarked.png");
-				agentFolder.setUserData("preferredHost", true);
 				var parent = agentNode.getParent();
 				parent.remove(agentNode);
 				parent.addAtBegin(agentNode);