From c5083612cb1ea8d315353e3d840a28a07542e4c0 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Tue, 21 Mar 2023 02:31:54 +0000
Subject: [PATCH 1/3] * Fix bug #33127.

---
 module/execution/view/edit.html.php | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/module/execution/view/edit.html.php b/module/execution/view/edit.html.php
index 9e25912f80..e3b878b4ef 100644
--- a/module/execution/view/edit.html.php
+++ b/module/execution/view/edit.html.php
@@ -87,25 +87,23 @@
             </div>
           </td>
         </tr>
-        <?php if($execution->type != 'kanban' or $project->model == 'waterfall' or $project->model == 'waterfallplus'):?>
+        <?php if($project->model == 'waterfall' or $project->model == 'waterfallplus'):?>
         <tr>
-          <th><?php echo $lang->execution->type;?></th>
+          <th><?php echo $lang->stage->type;?></th>
           <td>
-          <?php
-          if($project->model == 'waterfall' or $project->model == 'waterfallplus')
-          {
-              echo $enableOptionalAttr ? html::select('attribute', $lang->stage->typeList, $execution->attribute, "class='form-control chosen'") : zget($lang->stage->typeList, $execution->attribute);
-          }
-          elseif($execution->type != 'kanban')
-          {
-              echo html::select('lifetime', $lang->execution->lifeTimeList, $execution->lifetime, "class='form-control' onchange='showLifeTimeTips()'");
-          }
-          ?>
+          <?php echo $enableOptionalAttr ? html::select('attribute', $lang->stage->typeList, $execution->attribute, "class='form-control chosen'") : zget($lang->stage->typeList, $execution->attribute); ?>
           </td>
           <td>
             <icon class='icon icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='right' data-tip-class='text-muted popover-sm' data-content="<?php echo $lang->execution->typeTip;?>"></icon>
           </td>
         </tr>
+        <?php elseif($execution->type != 'kanban'):?>
+        <tr>
+          <th><?php echo $lang->execution->type;?></th>
+          <td>
+          <?php echo html::select('lifetime', $lang->execution->lifeTimeList, $execution->lifetime, "class='form-control' onchange='showLifeTimeTips()'"); ?>
+          </td>
+        </tr>
         <?php endif;?>
         <tr>
           <th><?php echo $lang->execution->teamname;?></th>

From 346ce0c994b102455212a3e42b5900dd3e95a7a6 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Tue, 21 Mar 2023 03:25:20 +0000
Subject: [PATCH 2/3] * Fix bug #33140.

---
 module/story/control.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/module/story/control.php b/module/story/control.php
index a88598b3e2..e393e73c1e 100755
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -960,6 +960,8 @@ class story extends control
         $branch         = $product->type == 'branch' ? ($story->branch > 0 ? $story->branch : '0') : 'all';
         $productStories = $this->story->getProductStoryPairs($story->product, $branch, 0, 'all', 'id_desc', 0, '', $story->type);
 
+        if($story->type == 'requirement') $this->lang->story->notice->reviewerNotEmpty = str_replace($this->lang->SRCommon, $this->lang->URCommon, $this->lang->story->notice->reviewerNotEmpty);
+
         $this->view->title            = $this->lang->story->edit . "STORY" . $this->lang->colon . $this->view->story->title;
         $this->view->position[]       = $this->lang->story->edit;
         $this->view->story            = $story;

From 1037f1aa821a8ffcd7d2b2d8febd24bb97a48adb Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Tue, 21 Mar 2023 03:27:35 +0000
Subject: [PATCH 3/3] * Fix bug #33139.

---
 module/execution/view/story.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php
index 8412190f4c..d724b16927 100644
--- a/module/execution/view/story.html.php
+++ b/module/execution/view/story.html.php
@@ -242,7 +242,7 @@
       $canBatchClose       = common::hasPriv('story', 'batchClose');
       $canBatchChangeStage = common::hasPriv('story', 'batchChangeStage');
       $canBatchUnlink      = common::hasPriv('execution', 'batchUnlinkStory');
-      $canBatchToTask      = common::hasPriv('story', 'batchToTask', $checkObject);
+      $canBatchToTask      = (common::hasPriv('story', 'batchToTask', $checkObject) and $storyType != 'requirement');
       $canBatchAssignTo    = common::hasPriv($storyType, 'batchAssignTo');
 
       $canBatchAction      = ($canBeChanged and ($canBatchEdit or $canBatchClose or $canBatchChangeStage or $canBatchUnlink or $canBatchToTask or $canBatchAssignTo));