From 86baf6e608370e24f7825b88e840991ccdace82e Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Wed, 30 Nov 2022 10:10:22 +0800
Subject: [PATCH] * Code for task#77794. Modify the page of plan view.

---
 module/productplan/control.php        |  2 --
 module/productplan/view/view.html.php | 10 ++++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/module/productplan/control.php b/module/productplan/control.php
index 83693364eb..f4419871cc 100644
--- a/module/productplan/control.php
+++ b/module/productplan/control.php
@@ -447,8 +447,6 @@ class productplan extends control
         if($plan->parent > 0)     $this->view->parentPlan    = $this->productplan->getById($plan->parent);
         if($plan->parent == '-1') $this->view->childrenPlans = $this->productplan->getChildren($plan->id);
 
-        if($plan->branch > 0) $this->view->branchStatus = $this->loadModel('branch')->getById($plan->branch, $plan->product, 'status');
-
         $storyIdList = array();
         $modulePairs = $this->loadModel('tree')->getOptionMenu($plan->product, 'story', 0, 'all');
         foreach($planStories as $story)
diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php
index 4a7c514fda..47cf7f6a8a 100644
--- a/module/productplan/view/view.html.php
+++ b/module/productplan/view/view.html.php
@@ -31,7 +31,9 @@
     <div class='page-title'>
       <span class='label label-id'><?php echo $plan->id;?></span>
       <span title='<?php echo $plan->title;?>' class='text'><?php echo $plan->title;?></span>
-      <?php if($product->type !== 'normal') echo "<span title='{$lang->product->branchName[$product->type]}' class='label label-branch label-badge'>" . $branchOption[$branch] . '</span>';?>
+      <?php foreach(explode(',', $branch) as $branchID):?>
+      <?php if($product->type !== 'normal') echo "<span title='{$lang->product->branchName[$product->type]}' class='label label-branch label-badge'>" . $branchOption[$branchID] . '</span>';?>
+      <?php endforeach;?>
       <span class='label label-info label-badge'>
         <?php echo ($plan->begin == $config->productplan->future || $plan->end == $config->productplan->future) ? $lang->productplan->future : $plan->begin . '~' . $plan->end;?>
       </span>
@@ -559,7 +561,11 @@
                 <?php if($product->type != 'normal'):?>
                 <tr>
                   <th><?php echo $lang->product->branch;?></th>
-                  <td><?php echo $branchOption[$plan->branch];?></td>
+                  <?php
+                  $branches = '';
+                  foreach(explode(',', $branch) as $branchID) $branches .= "{$branchOption[$branchID]},";
+                  ?>
+                  <td><?php echo trim($branches, ',');?></td>
                 </tr>
                 <?php endif;?>
                 <tr>