From c52fc593358ebf4352d4f3db8cd4313d080ebefb Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 13 Jul 2022 11:26:59 +0800
Subject: [PATCH] * Fix bug #25072.

---
 module/project/control.php          |  5 ++++-
 module/project/view/create.html.php | 13 +++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/module/project/control.php b/module/project/control.php
index e67c4917a4..ed73888b7c 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -493,7 +493,10 @@ class project extends control
             $products = $this->product->getProducts($copyProjectID);
             foreach($products as $product)
             {
-                $productPlans[$product->id] = $this->loadModel('productplan')->getPairs($product->id, '', 'noclosed');
+                foreach($product->branches as $branch)
+                {
+                    $productPlans[$product->id][$branch] = $this->loadModel('productplan')->getPairs($product->id, $branch, 'noclosed', true);
+                }
             }
         }
 
diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php
index 6a8febe208..faf29c5965 100755
--- a/module/project/view/create.html.php
+++ b/module/project/view/create.html.php
@@ -109,16 +109,18 @@
             <div class='row'>
               <?php $i = 0;?>
               <?php foreach($products as $product):?>
+              <?php foreach($product->branches as $branch):?>
               <div class="col-sm-4" style="margin-bottom: 10px; padding-right: 6px;">
                 <?php $hasBranch = $product->type != 'normal' and isset($branchGroups[$product->id]);?>
                 <div class="input-group<?php if($hasBranch) echo ' has-branch';?>">
                   <?php echo html::select("products[$i]", $allProducts, $product->id, "class='form-control chosen' onchange='loadBranches(this)' data-last='" . $product->id . "'");?>
                   <span class='input-group-addon fix-border'></span>
-                  <?php if($hasBranch) echo html::select("branch[$i]", $branchGroups[$product->id], key($product->branches), "class='form-control chosen' onchange=\"loadPlans('#products{$i}', this.value)\"");?>
+                  <?php if($hasBranch) echo html::select("branch[$i]", $branchGroups[$product->id], $branch, "class='form-control chosen' onchange=\"loadPlans('#products{$i}', this.value)\"");?>
                 </div>
               </div>
               <?php $i++;?>
               <?php endforeach;?>
+              <?php endforeach;?>
               <div class='col-sm-4 <?php if($programID) echo 'required';?>' style="padding-right: 6px;">
                 <div class='input-group'>
                   <?php echo html::select("products[$i]", $allProducts, '', "class='form-control chosen' onchange='loadBranches(this)'");?>
@@ -146,12 +148,15 @@
               <?php if($copyProjectID):?>
               <?php $i = 0;?>
               <?php foreach($products as $product):?>
-              <?php $plans = zget($productPlans, $product->id, array(0 => ''));?>
-              <div class="col-sm-4" id="plan<?php echo $i;?>"><?php echo html::select("plans[" . $product->id . "]", $plans, '', "class='form-control chosen' multiple");?></div>
+              <?php $productPlan = zget($productPlans, $product->id, array(0 => ''));?>
+              <?php foreach($product->branches as $branch):?>
+              <?php $plans = zget($productPlan, $branch, array(0 => ''));?>
+              <div class="col-sm-4" id="plan<?php echo $i;?>"><?php echo html::select('plans[' . $product->id . '][' . $branch . '][]', $plans, '', "class='form-control chosen' multiple");?></div>
               <?php $i++;?>
               <?php endforeach;?>
+              <?php endforeach;?>
               <?php else:?>
-              <div class="col-sm-4" id="plan0" style="padding-right: 6px;"><?php echo html::select("plans[][]", '', '', "class='form-control chosen' multiple");?></div>
+              <div class="col-sm-4" id="plan0" style="padding-right: 6px;"><?php echo html::select("plans[][][]", '', '', "class='form-control chosen' multiple");?></div>
               <?php endif;?>
             </div>
           </td>