From b34e312e867d6d421cd6bd5b836c10b73fac7ffd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= <sunguangming@cnezsoft.com>
Date: Fri, 30 Dec 2022 14:18:28 +0800
Subject: [PATCH] * Fix bug #31353.

---
 module/execution/view/create.html.php | 8 +++++++-
 module/execution/view/edit.html.php   | 6 +++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php
index 87b0986e9f..8b8924cb7c 100644
--- a/module/execution/view/create.html.php
+++ b/module/execution/view/create.html.php
@@ -143,7 +143,9 @@
                     <?php $hasBranch = $product->type != 'normal' and isset($branchGroups[$product->id]);?>
                     <div class='input-group <?php if($hasBranch) echo ' has-branch';?>'>
                       <span class='input-group-addon'><?php echo $lang->product->common;?></span> 
-                      <?php echo html::select("products[$i]", $allProducts, $product->id, "class='form-control chosen' onchange='loadBranches(this)' data-last='" . $product->id . "' data-type='" . $product->type . "'");?>
+                      <?php $disabled = ($project->model == 'waterfall' and !$project->division) ? "disabled='disabled'" : '';?>
+                      <?php echo html::select("products[$i]", $allProducts, $product->id, "class='form-control chosen' $disabled onchange='loadBranches(this)' data-last='" . $product->id . "' data-type='" . $product->type . "'");?>
+                      <?php if($project->model == 'waterfall' and !$project->division) echo html::hidden("products[$i]", $product->id);?>
                     </div>
                   </div>
                   <div class='table-col <?php if(!$hasBranch) echo 'hidden';?>'>
@@ -159,10 +161,12 @@
                 <div class='input-group' <?php echo "id='plan$i'";?>>
                   <span class='input-group-addon'><?php echo $lang->product->plan;?></span>
                   <?php echo html::select("plans[$product->id][]", isset($productPlans[$product->id]) ? $productPlans[$product->id] : array(), isset($product->plans) ? $product->plans : '', "class='form-control chosen' multiple");?>
+                  <?php if(!($project->model == 'waterfall' and !$project->division)):?>
                   <div class='input-group-btn'>
                     <a href='javascript:;' onclick='addNewLine(this)' class='btn btn-link addLine'><i class='icon-plus'></i></a>
                     <a href='javascript:;' onclick='removeLine(this)' class='btn btn-link removeLine' <?php if($i == 0) echo "style='visibility: hidden'";?>><i class='icon-close'></i></a>
                   </div>
+                  <?php endif;?>
                 </div>
               </div>
             </div>
@@ -195,10 +199,12 @@
                 <div class='input-group' id='plan0'>
                   <span class='input-group-addon'><?php echo $lang->product->plan;?></span>
                   <?php echo html::select("plans[][]", $productPlan, '', "class='form-control chosen' multiple");?>
+                  <?php if(!($project->model == 'waterfall' and $project->division)):?>
                   <div class='input-group-btn'>
                     <a href='javascript:;' onclick='addNewLine(this)' class='btn btn-link addLine'><i class='icon-plus'></i></a>
                     <a href='javascript:;' onclick='removeLine(this)' class='btn btn-link removeLine' style='visibility: hidden'><i class='icon-close'></i></a>
                   </div>
+                  <?php endif;?>
                 </div>
               </div>
             </div>
diff --git a/module/execution/view/edit.html.php b/module/execution/view/edit.html.php
index f2eaf83b23..54e94e7377 100644
--- a/module/execution/view/edit.html.php
+++ b/module/execution/view/edit.html.php
@@ -154,7 +154,9 @@
                     <?php $hasBranch = $product->type != 'normal' and isset($branchGroups[$product->id]);?>
                     <div class='input-group <?php if($hasBranch) echo ' has-branch';?>'>
                       <span class='input-group-addon'><?php echo $lang->product->common;?></span> 
-                      <?php echo html::select("products[$i]", $allProducts, $product->id, "class='form-control chosen' onchange='loadBranches(this)' data-last='" . $product->id . "' data-type='" . $product->type . "'");?>
+                      <?php $disabled = ($execution->type == 'stage' and !$execution->division) ? "disabled='disabled'" : '';?>
+                      <?php echo html::select("products[$i]", $allProducts, $product->id, "class='form-control chosen' $disabled onchange='loadBranches(this)' data-last='" . $product->id . "' data-type='" . $product->type . "'");?>
+                      <?php if($execution->type == 'stage' and !$execution->division) echo html::hidden("products[$i]", $product->id);?>
                     </div>
                   </div>
                   <div class='table-col <?php if(!$hasBranch) echo 'hidden';?>'>
@@ -170,10 +172,12 @@
                 <div class='input-group' <?php echo "id='plan$i'";?>>
                   <span class='input-group-addon'><?php echo $lang->product->plan;?></span>
                   <?php echo html::select("plans[$product->id][]", isset($productPlans[$product->id]) ? $productPlans[$product->id] : array(), $product->plans, "class='form-control chosen' multiple");?>
+                  <?php if(!($execution->type == 'stage' and !$execution->division)):?>
                   <div class='input-group-btn'>
                     <a href='javascript:;' onclick='addNewLine(this)' class='btn btn-link addLine'><i class='icon-plus'></i></a>
                     <a href='javascript:;' onclick='removeLine(this)' class='btn btn-link removeLine' <?php if($i == 0) echo "style='visibility: hidden'";?>><i class='icon-close'></i></a>
                   </div>
+                  <?php endif;?>
                 </div>
               </div>
             </div>