FC-2851 Category Tree in edit handler is not expanding as default whe…

…n there are already sub-categories checked
farcrycore · Jul 15, 2014 · 86d23cc · 86d23cc
1 parent 45d5256
commit 86d23cc
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/packages/formtools/category.cfc b/packages/formtools/category.cfc
@@ -192,7 +192,8 @@
 		<cfset var html = "" />
 		<cfset var stTree = application.factory.oTree.getDescendantsAsNestedStruct(dsn=application.dsn,objectid=application.catid.root) />
 		<cfset var stBranch = structnew() />
-
+		<cfset var lCatIDs = "">
+
 		<cfimport taglib="/farcry/core/tags/webskin" prefix="skin" />
 		<cfimport taglib="/farcry/core/tags/admin" prefix="admin" />
 
@@ -210,7 +211,14 @@
 			<cfset stBranch = application.factory.oTree.getDescendantsAsNestedStruct(dsn=application.dsn,objectid=application.catid[arguments.stMetadata.ftAlias]) />
 		</cfif>
 		<cfset stBranch["roothash"] = stTree.hash />
-
+
+		<cfloop list="#arguments.stMetadata.value#" index="catID">
+			<cfset qParent = application.factory.oTree.getParentID(objectid=catID)>
+			<cfif NOT listFindNoCase(lCatIDs, qParent.parentID)>
+				<cfset lCatIDs = listAppend(lCatIDs, qParent.parentID)>
+			</cfif>
+		</cfloop>
+
 		<cfsavecontent variable="html"><cfoutput>
 			<div class="multiField">
 				<div id="#arguments.fieldname#-tree"></div>
@@ -230,7 +238,8 @@
 						allowSelect : #serializeJSON(arguments.stMetadata.ftJQueryAllowEdit)#,
 						quickEdit : #serializeJSON(arguments.stMetadata.ftJQueryQuickEdit)#,
 						selectMultiple : #serializeJSON(arguments.stMetadata.ftSelectMultiple)#,
-						visibleInputs : #serializeJSON(arguments.stMetadata.ftJQueryVisibleInputs)#
+						visibleInputs : #serializeJSON(arguments.stMetadata.ftJQueryVisibleInputs)#,
+						openNodes:#serializeJSON(listtoarray(lCatIDs))#
 
 						<cfif len(arguments.stMetadata.ftJQueryOnEdit)>,onEditNode:function onEdit#arguments.fieldname#(node){ #arguments.stMetadata.ftJQueryOnEdit# }</cfif>
 						<cfif len(arguments.stMetadata.ftJQueryOnAdd)>,onAddNode:function onAdd#arguments.fieldname#(node,newid){ #arguments.stMetadata.ftJQueryOnAdd# }</cfif>

diff --git a/webtop/thirdparty/jqTree/category-formtool.js b/webtop/thirdparty/jqTree/category-formtool.js
@@ -316,6 +316,7 @@ jQuery.fn.unblock = function(){
 			selectMultiple : false,
 			visibleInputs : false,
 			selected : [],
+			openNodes : [],
 			quickEdit : false,
 
 			onEditNode : function onEditNode(node){
@@ -402,8 +403,8 @@ jQuery.fn.unblock = function(){
 		$this.on("treeupdate-finish",options.onUpdateFinish);
 		$this.on("treeupdate-error",options.onUpdateError);
 
-		for (var i=0; i<options.selected.length; i++)
-			$this.tree("openNode",$this.tree("getNodeById",options.selected[i]));
+		for (var i=0; i<options.openNodes.length; i++)
+			$this.tree("openNode",$this.tree("getNodeById",options.openNodes[i]));
 
 		// data
 		$this.data("url",options.dataUrl);