Show trash button only if the filter state is not on trashed (#46)

bembelimen · Jul 21, 2017 · ce4dee9 · ce4dee9
1 parent d9761af
commit ce4dee9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/administrator/components/com_workflow/View/Transitions/Html.php b/administrator/components/com_workflow/View/Transitions/Html.php
@@ -145,11 +145,14 @@ protected function addToolbar()
 		ToolbarHelper::editList('transition.edit');
 		ToolbarHelper::publishList('transitions.publish');
 		ToolbarHelper::unpublishList('transitions.unpublish');
-		ToolbarHelper::trash('transitions.trash');
 
 		if ($this->state->get("filter.published") === "-2")
 		{
 			ToolbarHelper::deleteList(\JText::_('COM_WORKFLOW_ARE_YOU_SURE'), 'transitions.delete');
 		}
+		else
+		{
+			ToolbarHelper::trash('transitions.trash');
+		}
 	}
 }
diff --git a/administrator/components/com_workflow/View/Workflows/Html.php b/administrator/components/com_workflow/View/Workflows/Html.php
@@ -117,14 +117,18 @@ protected function addToolbar()
 		ToolbarHelper::publishList('workflows.publish');
 		ToolbarHelper::unpublishList('workflows.unpublish');
 		ToolbarHelper::archiveList('workflows.archive');
-		ToolbarHelper::trash('workflows.trash');
 		ToolbarHelper::checkin('workflows.checkin', 'JTOOLBAR_CHECKIN', true);
 		ToolbarHelper::makeDefault('workflows.setDefault', 'COM_WORKFLOW_TOOLBAR_SET_HOME');
 
 		if ($this->state->get("filter.published") === "-2")
 		{
 			ToolbarHelper::deleteList(\JText::_('COM_WORKFLOW_ARE_YOU_SURE'), 'workflows.delete');
 		}
+		else
+		{
+			ToolbarHelper::trash('workflows.trash');
+		}
+
 		ToolbarHelper::help('JHELP_WORKFLOWS_LIST');
 	}