Fixing inability to create new topic tree

concretecms · May 21, 2015 · c24ecd6 · c24ecd6
1 parent 0610245
commit c24ecd6
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 2 deletions.
diff --git a/web/concrete/attributes/topics/form.php b/web/concrete/attributes/topics/form.php
@@ -12,6 +12,7 @@
 			'treeID': '<?php echo $treeID ?>',
 			'treeNodeParentID': '<?php echo $parentNode ?>',
 			'chooseNodeInForm': 'multiple',
+			'allowFolderSelection': false,
 			'selectNodesByKey': [<?php echo $valueIDs ?>],
 			'selectMode': '2',
 			'noDrag' : true,

diff --git a/web/concrete/attributes/topics/search.php b/web/concrete/attributes/topics/search.php
@@ -5,7 +5,6 @@
             $('.tree-view-template-<?=$attributeKey->getAttributeKeyID()?>').ccmtopicstree({  // run first time around to get default tree if new.
                 'treeID': <?php echo $tree->getTreeID(); ?>,
                 'chooseNodeInForm': true,
-                'allowFolderSelection': true,
                 'noDrag' : true,
                 <?php if($selectedNode) { ?>
                  'selectNodesByKey': [<?php echo $selectedNode ?>],

diff --git a/web/concrete/js/build/core/topics.js b/web/concrete/js/build/core/topics.js
@@ -203,7 +203,7 @@
 			readonly: false,
 			chooseNodeInForm: false,
 			onSelect: false,
-			allowFolderSelection: false,
+			allowFolderSelection: true,
 			selectNodesByKey: []
 		}, options);
 

diff --git a/web/concrete/tools/tree/node/load.php b/web/concrete/tools/tree/node/load.php
@@ -11,6 +11,7 @@
 if (is_object($node)) {
 	$np = new Permissions($node);
 	if ($np->canViewTreeNode()) {
+		$node->getTreeObject()->setRequest($_REQUEST);
 		$node->populateDirectChildrenOnly();
 		$r = array();
 		if(count($selected) > 0) {