From d1d05a067e585a46e18ec62fb659f3cadbcb9367 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Mon, 16 May 2022 01:38:43 +0000
Subject: [PATCH 1/3] * Fix bug #22441.

---
 module/execution/view/task.html.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/module/execution/view/task.html.php b/module/execution/view/task.html.php
index 9932a9107c..230e5d727e 100644
--- a/module/execution/view/task.html.php
+++ b/module/execution/view/task.html.php
@@ -162,8 +162,8 @@ body {margin-bottom: 25px;}
       ?>
       <button type='button' class='btn btn-primary dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>
       <ul class='dropdown-menu pull-right'>
-        <li><?php echo html::a($taskCreateLink, $lang->task->create);?></li>
-        <li><?php echo html::a($this->createLink('task', 'batchCreate', "executionID=$executionID" . (isset($moduleID) ? "&storyID=0&moduleID=$moduleID" : "")), $lang->task->batchCreate);?></li>
+        <li><?php echo html::a($taskCreateLink, "<i class='icon icon-plus'></i> " .  $lang->task->create);?></li>
+        <li><?php echo html::a($this->createLink('task', 'batchCreate', "executionID=$executionID" . (isset($moduleID) ? "&storyID=0&moduleID=$moduleID" : "")), "<i class='icon icon-plus'></i> " .  $lang->task->batchCreate);?></li>
       </ul>
     </div>
     <?php endif;?>
@@ -178,6 +178,7 @@ body {margin-bottom: 25px;}
       <li <?php echo $disabled?>>
       <?php
         $batchLink = $this->createLink('task', 'batchCreate', "execution=$executionID" . (isset($moduleID) ? "&storyID=&moduleID=$moduleID" : ''));
+        echo "<li>" . html::a($taskCreateLink, "<i class='icon icon-plus'></i> " . $lang->task->create) . "</li>";
         echo "<li>" . html::a($batchLink, "<i class='icon icon-plus'></i> " . $lang->task->batchCreate) . "</li>";
       ?>
       </li>

From a5783fa37cabd169a8ff6ba587600f0aceca9c59 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Mon, 16 May 2022 01:55:08 +0000
Subject: [PATCH 2/3] * Fix bug #22441.

---
 module/execution/view/task.html.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/module/execution/view/task.html.php b/module/execution/view/task.html.php
index 230e5d727e..141f65ab3f 100644
--- a/module/execution/view/task.html.php
+++ b/module/execution/view/task.html.php
@@ -149,7 +149,6 @@ body {margin-bottom: 25px;}
     $checkObject->execution = $executionID;
     $taskCreateLink = $this->createLink('task', 'create', "executionID=$executionID" . (isset($moduleID) ? "&storyID=0&moduleID=$moduleID" : ""));
     ?>
-    <?php if(!common::checkNotCN()):?>
     <?php if($canBeChanged and (common::hasPriv('task', 'batchCreate', $checkObject) or common::hasPriv('task', 'create', $checkObject))):?>
     <div class='btn-group dropdown'>
       <?php
@@ -178,7 +177,6 @@ body {margin-bottom: 25px;}
       <li <?php echo $disabled?>>
       <?php
         $batchLink = $this->createLink('task', 'batchCreate', "execution=$executionID" . (isset($moduleID) ? "&storyID=&moduleID=$moduleID" : ''));
-        echo "<li>" . html::a($taskCreateLink, "<i class='icon icon-plus'></i> " . $lang->task->create) . "</li>";
         echo "<li>" . html::a($batchLink, "<i class='icon icon-plus'></i> " . $lang->task->batchCreate) . "</li>";
       ?>
       </li>
@@ -186,7 +184,6 @@ body {margin-bottom: 25px;}
     <?php echo "</div>";?>
     <?php endif;?>
   </div>
-  <?php endif; ?>
 </div>
 <?php if($this->app->getViewType() == 'xhtml'):?>
 <div id="xx-title">

From 53102c368ea8bb991afa17c5048a8f35152e05fb Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Mon, 16 May 2022 03:28:40 +0000
Subject: [PATCH 3/3] * Fix bug #22441.

---
 module/execution/view/task.html.php | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/module/execution/view/task.html.php b/module/execution/view/task.html.php
index 141f65ab3f..560523475e 100644
--- a/module/execution/view/task.html.php
+++ b/module/execution/view/task.html.php
@@ -161,29 +161,13 @@ body {margin-bottom: 25px;}
       ?>
       <button type='button' class='btn btn-primary dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>
       <ul class='dropdown-menu pull-right'>
-        <li><?php echo html::a($taskCreateLink, "<i class='icon icon-plus'></i> " .  $lang->task->create);?></li>
-        <li><?php echo html::a($this->createLink('task', 'batchCreate', "executionID=$executionID" . (isset($moduleID) ? "&storyID=0&moduleID=$moduleID" : "")), "<i class='icon icon-plus'></i> " .  $lang->task->batchCreate);?></li>
+        <li><?php echo html::a($taskCreateLink, $lang->task->create);?></li>
+        <li><?php echo html::a($this->createLink('task', 'batchCreate', "executionID=$executionID" . (isset($moduleID) ? "&storyID=0&moduleID=$moduleID" : "")), $lang->task->batchCreate);?></li>
       </ul>
     </div>
     <?php endif;?>
-    <?php else:?>
-    <?php
-    echo "<div class='btn-group dropdown-hover'>";
-    $link = $this->createLink('task', 'create', "execution=$executionID" . (isset($moduleID) ? "&storyID=0&moduleID=$moduleID" : ""));
-    if($canBeChanged and common::hasPriv('task', 'create', $checkObject)) echo html::a($link, "<i class='icon icon-plus'></i> {$lang->task->create} </span><span class='caret'>", '', "class='btn btn-primary'");
-    ?>
-    <ul class='dropdown-menu'>
-      <?php $disabled = common::hasPriv('task', 'batchCreate') ? '' : "class='disabled'";?>
-      <li <?php echo $disabled?>>
-      <?php
-        $batchLink = $this->createLink('task', 'batchCreate', "execution=$executionID" . (isset($moduleID) ? "&storyID=&moduleID=$moduleID" : ''));
-        echo "<li>" . html::a($batchLink, "<i class='icon icon-plus'></i> " . $lang->task->batchCreate) . "</li>";
-      ?>
-      </li>
-    </ul>
-    <?php echo "</div>";?>
-    <?php endif;?>
   </div>
+  <?php endif;?>
 </div>
 <?php if($this->app->getViewType() == 'xhtml'):?>
 <div id="xx-title">