diff --git a/administrator/components/com_workflow/View/Stages/HtmlView.php b/administrator/components/com_workflow/View/Stages/HtmlView.php index 9ffd611a6e9a0..ecec43122ce99 100644 --- a/administrator/components/com_workflow/View/Stages/HtmlView.php +++ b/administrator/components/com_workflow/View/Stages/HtmlView.php @@ -171,10 +171,14 @@ protected function addToolbar() ToolbarHelper::addNew('stage.add'); } - if ($canDo->get('core.edit.state') && !$isCore) + if ($canDo->get('core.edit.state')) { - ToolbarHelper::publishList('stages.publish'); - ToolbarHelper::unpublishList('stages.unpublish'); + if (!$isCore) + { + ToolbarHelper::publishList('stages.publish'); + ToolbarHelper::unpublishList('stages.unpublish'); + } + ToolbarHelper::makeDefault('stages.setDefault', 'COM_WORKFLOW_TOOLBAR_DEFAULT'); } diff --git a/administrator/components/com_workflow/tmpl/stages/default.php b/administrator/components/com_workflow/tmpl/stages/default.php index 534ba078ce4d6..af2f577c7e588 100644 --- a/administrator/components/com_workflow/tmpl/stages/default.php +++ b/administrator/components/com_workflow/tmpl/stages/default.php @@ -89,10 +89,10 @@ stages as $i => $item): $edit = Route::_('index.php?option=com_workflow&task=stage.edit&id=' . $item->id . '&workflow_id=' . (int) $this->workflowID . '&extension=' . $this->extension); - $canEdit = $user->authorise('core.edit', $this->extension . '.stage.' . $item->id) && !$isCore; + $canEdit = $user->authorise('core.edit', $this->extension . '.stage.' . $item->id); // @TODO set proper checkin fields $canCheckin = true || $user->authorise('core.admin', 'com_checkin') || $item->checked_out == $userId || $item->checked_out == 0; - $canChange = $user->authorise('core.edit.stage', $this->extension . '.stage.' . $item->id) && $canCheckin && !$isCore; + $canChange = $user->authorise('core.edit.stage', $this->extension . '.stage.' . $item->id) && $canCheckin; ?>