From ffb6c38e3d64efd09745fd9f0b3c286807c8a812 Mon Sep 17 00:00:00 2001 From: scott1702 Date: Mon, 15 Jun 2015 16:33:30 +1200 Subject: [PATCH] Remove 'Filtered Tree' notification when clearing the filter --- code/controllers/CMSMain.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/code/controllers/CMSMain.php b/code/controllers/CMSMain.php index bfc0cc18..817bf398 100644 --- a/code/controllers/CMSMain.php +++ b/code/controllers/CMSMain.php @@ -290,7 +290,13 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr * @return boolean */ public function TreeIsFiltered() { - return $this->getRequest()->getVar('q'); + $query = $this->getRequest()->getVar('q'); + + if (!$query || (count($query) === 1 && isset($query['FilterClass']) && $query['FilterClass'] === 'CMSSiteTreeFilter_Search')) { + return false; + } + + return true; } public function ExtraTreeTools() { @@ -351,8 +357,8 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr // Create the Search and Reset action $actions = new FieldList( FormAction::create('doSearch', _t('CMSMain_left_ss.APPLY_FILTER', 'Apply Filter')) - ->addExtraClass('ss-ui-action-constructive'), - Object::create('ResetFormAction', 'clear', _t('CMSMain_left_ss.RESET', 'Reset')) + ->addExtraClass('ss-ui-action-constructive'), + Object::create('ResetFormAction', 'clear', _t('CMSMain_left_ss.CLEAR_FILTER', 'Clear Filter')) ); // Use