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] * 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>