Guided Tours: Fix for Toggle Inline Help and Help buttons (Creating a step) (#40288)

Author: Kostelano

administrator/components/com_guidedtours/src/View/Step/HtmlView.php

@@ -136,21 +136,21 @@ protected function addToolbar()
                     $toolbarButtons,
                     'btn-success'
                 );
-            }
 
-            ToolbarHelper::cancel(
-                'step.cancel',
-                'JTOOLBAR_CLOSE'
-            );
+                ToolbarHelper::cancel(
+                    'step.cancel',
+                    'JTOOLBAR_CLOSE'
+                );
+            }
+        }
 
-            ToolbarHelper::divider();
-            $inlinehelp  = (string) $this->form->getXml()->config->inlinehelp['button'] == 'show' ?: false;
-            $targetClass = (string) $this->form->getXml()->config->inlinehelp['targetclass'] ?: 'hide-aware-inline-help';
+        ToolbarHelper::divider();
+        $inlinehelp  = (string) $this->form->getXml()->config->inlinehelp['button'] == 'show' ?: false;
+        $targetClass = (string) $this->form->getXml()->config->inlinehelp['targetclass'] ?: 'hide-aware-inline-help';
 
-            if ($inlinehelp) {
-                ToolbarHelper::inlinehelp($targetClass);
-            }
-            ToolbarHelper::help('Guided_Tours:_New_or_Edit_Step');
+        if ($inlinehelp) {
+            ToolbarHelper::inlinehelp($targetClass);
         }
+        ToolbarHelper::help('Guided_Tours:_New_or_Edit_Step');
     }
 }

administrator/components/com_guidedtours/src/View/Tour/HtmlView.php

@@ -115,6 +115,10 @@ protected function addToolbar()
                 $toolbarButtons,
                 'btn-success'
             );
+
+            ToolbarHelper::cancel(
+                'tour.cancel'
+            );
         } else {
             // Since it's an existing record, check the edit permission, or fall back to edit own if the owner.
             $itemEditable = $canDo->get('core.edit') || ($canDo->get('core.edit.own') && $this->item->created_by == $userId);
@@ -133,14 +137,14 @@ protected function addToolbar()
                     $toolbarButtons,
                     'btn-success'
                 );
+
+                ToolbarHelper::cancel(
+                    'tour.cancel',
+                    'JTOOLBAR_CLOSE'
+                );
             }
         }
 
-        ToolbarHelper::cancel(
-            'tour.cancel',
-            'JTOOLBAR_CLOSE'
-        );
-
         ToolbarHelper::divider();
 
         $inlinehelp  = (string) $this->form->getXml()->config->inlinehelp['button'] == 'show' ?: false;