From f6e4a00c2509ac048d318a2ec7da72c25f04e7d9 Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Tue, 29 Mar 2022 02:11:46 +0000
Subject: [PATCH 1/2] * Fix bug#21092

---
 module/tutorial/js/index.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/module/tutorial/js/index.js b/module/tutorial/js/index.js
index 43e450fe1b..2064a6b582 100644
--- a/module/tutorial/js/index.js
+++ b/module/tutorial/js/index.js
@@ -168,6 +168,8 @@ $(function()
             container = null;
         }
 
+        if($(ele).hasClass('create-bug-btn')) container = '.btn-toolbar.pull-right'; // Fix bug #21092.
+
         $e.closest('body').find('.tooltip-tutorial').tooltip('destroy');
         var offset   = $e.offset();
         var winWidth = $(window).width();

From 028833b83860fc1fc21f31599f78de8c1159cbbf Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Tue, 29 Mar 2022 06:16:14 +0000
Subject: [PATCH 2/2] * Fix bug#21092,11398

---
 module/execution/view/story.html.php | 2 +-
 module/tutorial/js/index.js          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php
index c67e6f6d21..4da719b838 100644
--- a/module/execution/view/story.html.php
+++ b/module/execution/view/story.html.php
@@ -335,7 +335,7 @@
             $actionLink = $this->createLink('story', 'batchEdit', "productID=0&executionID=$execution->id");
             echo html::commonButton($lang->edit, "data-form-action='$actionLink' $disabled");
             ?>
-            <button type='button' class='btn dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>
+            <button type='button' <?php echo $canBatchToTask ? '' : "disabled='disabled'";?> class='btn dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>
             <ul class='dropdown-menu'>
               <?php
               $class = $canBatchToTask ? '' : "class='hidden'";
diff --git a/module/tutorial/js/index.js b/module/tutorial/js/index.js
index 2064a6b582..3fc344e5d7 100644
--- a/module/tutorial/js/index.js
+++ b/module/tutorial/js/index.js
@@ -168,7 +168,7 @@ $(function()
             container = null;
         }
 
-        if($(ele).hasClass('create-bug-btn')) container = '.btn-toolbar.pull-right'; // Fix bug #21092.
+        if($(ele).hasClass('create-bug-btn') || $(ele).hasClass('create-story-btn')) container = '#mainMenu'; // Fix bug #21092.
 
         $e.closest('body').find('.tooltip-tutorial').tooltip('destroy');
         var offset   = $e.offset();