[4.2] Workflow Transitions

Recently there have been several people posting that they don't understand Workflows. I was reviewing my notes from the Workflows presentation I gave this year at JoomlaDay fr and I realised that we can easily remove one area of confusion.
joomla · Nov 28, 2022 · 0e240a8 · 0e240a8
1 parent 1fc0330
commit 0e240a8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/administrator/language/en-GB/com_content.ini b/administrator/language/en-GB/com_content.ini
@@ -160,6 +160,7 @@ COM_CONTENT_PUBLISH_DOWN_DESC="Finish Publishing descending"
 COM_CONTENT_PUBLISH_UP_ASC="Start Publishing ascending"
 COM_CONTENT_PUBLISH_UP_DESC="Start Publishing descending"
 COM_CONTENT_PUBLISHED="Published"
+COM_CONTENT_RUN_TRANSITION="Run Transition"
 COM_CONTENT_RUN_TRANSITIONS="Run Transitions"
 COM_CONTENT_SAVE_SUCCESS="Article saved."
 COM_CONTENT_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the article to customise the alias."

diff --git a/layouts/joomla/button/transition-button.php b/layouts/joomla/button/transition-button.php
@@ -58,10 +58,11 @@
         <?php
             $default = [
                 HTMLHelper::_('select.option', '', $this->escape($options['title'])),
-                HTMLHelper::_('select.option', '-1', '--------', ['disable' => true])
+                HTMLHelper::_('select.option', '-1', '--------', ['disable' => true]),
+                HTMLHelper::_('select.option', '<OPTGROUP>', Text::_('COM_CONTENT_RUN_TRANSITION')),
             ];
 
-            $transitions = array_merge($default, $options['transitions']);
+            $transitions = array_merge($default, $options['transitions'], [HTMLHelper::_('select.option', '</OPTGROUP>')]);
 
             $attribs = [
                 'id'        => 'transition-select_' . (int) $row ?? '',

diff --git a/libraries/src/Form/Field/TransitionField.php b/libraries/src/Form/Field/TransitionField.php
@@ -161,15 +161,17 @@ function ($item) use ($user, $component) {
 
         $workflowName = $db->setQuery($query)->loadResult();
 
-        $default = [HTMLHelper::_('select.option', '', Text::_($workflowName))];
+        $default = [
+            HTMLHelper::_('select.option', '', Text::_($workflowName))];
 
         $options = array_merge(parent::getOptions(), $items);
 
         if (\count($options)) {
             $default[] = HTMLHelper::_('select.option', '-1', '--------', ['disable' => true]);
+            $default[] = HTMLHelper::_('select.option', '<OPTGROUP>', Text::_('COM_CONTENT_RUN_TRANSITION'));
         }
 
         // Merge with defaults
-        return array_merge($default, $options);
+        return array_merge($default, $options, [HTMLHelper::_('select.option', '</OPTGROUP>')]);
     }
 }