From 990ae9f145498e54c84f85686f5b9335ef1ad989 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Sat, 21 Nov 2009 03:21:03 +0000
Subject: [PATCH] BUGFIX Fixed CMSMain.js search clearing logic, wasnt clearing
 the first field properly. Fixed LeftAndMain->getsubtree() filtering in
 AssetAdmin and SecurityAdmin.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92849 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/AssetAdmin.php      | 5 +++++
 code/LeftAndMain.php     | 3 ++-
 code/SecurityAdmin.php   | 5 +++++
 javascript/AssetAdmin.js | 6 +++++-
 javascript/CMSMain.js    | 3 ++-
 5 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php
index f84a6021..ab542726 100755
--- a/code/AssetAdmin.php
+++ b/code/AssetAdmin.php
@@ -260,6 +260,11 @@ HTML;
 		return $this->getSiteTreeFor($this->stat('tree_class'), null, 'ChildFolders');
 	}
 	
+	function getSiteTreeFor($className, $rootID = null, $childrenMethod = null, $filterFunction = null, $minNodeCount = 30) {
+		if (!$childrenMethod) $childrenMethod = 'ChildFolders';
+		return parent::getSiteTreeFor($className, $rootID, $childrenMethod, $filterFunction, $minNodeCount);
+	}
+	
 	public function getCMSTreeTitle() {
 		return Director::absoluteBaseURL() . "assets";
 	}
diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index eafd8e94..dff15e41 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -492,6 +492,7 @@ class LeftAndMain extends Controller {
 			. '".$child->class."\" >" . ($child->TreeTitle) . 
 			"</a>"
 		';
+
 		$siteTree = $obj->getChildrenAsUL(
 			"", 
 			$titleEval,
@@ -525,7 +526,7 @@ class LeftAndMain extends Controller {
 			$this->stat('tree_class'), 
 			$request->getVar('ID'), 
 			null, 
-			array($this->getMarkingFilter($request->requestVars()), 'mark'), 
+			null, 
 			$request->getVar('minNodeCount')
 		);
 
diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php
index 6da54d76..d4343dec 100644
--- a/code/SecurityAdmin.php
+++ b/code/SecurityAdmin.php
@@ -183,6 +183,11 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 		return FormResponse::respond();
 	}
 	
+	function getSiteTreeFor($className, $rootID = null, $childrenMethod = null, $filterFunction = null, $minNodeCount = 30) {
+		if (!$childrenMethod) $childrenMethod = 'stageChildren';
+		return parent::getSiteTreeFor($className, $rootID, $childrenMethod, $filterFunction, $minNodeCount);
+	}
+	
 	function getCMSTreeTitle() {
 		return _t('SecurityAdmin.SGROUPS', 'Security Groups');
 	}
diff --git a/javascript/AssetAdmin.js b/javascript/AssetAdmin.js
index 8634e0e9..b2beafb3 100755
--- a/javascript/AssetAdmin.js
+++ b/javascript/AssetAdmin.js
@@ -44,12 +44,16 @@ var _HANDLER_FORMS = {
 					jQuery(this).attr('action'),
 					function() {
 						button.removeClass('loading');
-						// reload current
+						// reload current form and tree
 						var currNode = $('#sitetree')[0].firstSelected();
 						if(currNode) {
 						  var url = $(currNode).find('a').attr('href');
         			$('#Form_EditForm').loadForm(url);
 						}
+						$('#sitetree')[0].setCustomURL('admin/assets/getsubtree');
+						$('#sitetree')[0].reload({onSuccess: function() {
+							// TODO Reset current tree node
+						}});
 					}
 				);
 				
diff --git a/javascript/CMSMain.js b/javascript/CMSMain.js
index 5834a285..977cc7ba 100644
--- a/javascript/CMSMain.js
+++ b/javascript/CMSMain.js
@@ -99,7 +99,8 @@
 			},
 	
 			onreset: function(e) {
-				this.find('.field').clearFields().not(':first').hide();
+				this.find('.field :input').clearFields();
+				this.find('.field').not(':first').hide();
 		
 				// Reset URL to default
 				$('#sitetree')[0].clearCustomURL();