From 02ce779b654fbb25689212e009d37c2f979aaf17 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Thu, 26 Nov 2015 13:29:29 +0800
Subject: [PATCH]  * adjust code.

---
 module/project/control.php             | 15 ++++++++-------
 module/project/view/linkstory.html.php |  8 ++++++--
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/module/project/control.php b/module/project/control.php
index 96493640f6..23c6602d4b 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -1537,10 +1537,10 @@ class project extends control
 
         $queryID = ($browseType == 'bySearch') ? (int)$param : 0;
 
-        $allBranches = $this->loadModel('branch')->getByProducts(array_keys($products), 'noempty');
-        $branchPairs = array();
-        $productType = 'normal';
-        $productNum  = count($products);
+        $branchGroups = $this->loadModel('branch')->getByProducts(array_keys($products), 'noempty');
+        $branchPairs  = array();
+        $productType  = 'normal';
+        $productNum   = count($products);
         foreach($products as $product)
         {
             $productPairs[$product->id] = $product->name;
@@ -1550,11 +1550,11 @@ class project extends control
                 $productType = $product->type;
                 if($product->branch)
                 {
-                    $branchPairs[$product->branch] = ($productNum > 1 ? $product->name . '/' : '') . $allBranches[$product->id][$product->branch];
+                    $branchPairs[$product->branch] = ($productNum > 1 ? $product->name . '/' : '') . $branchGroups[$product->id][$product->branch];
                 }
                 else
                 {
-                    $productBranches = $allBranches[$product->id];
+                    $productBranches = $branchGroups[$product->id];
                     if($productNum > 1)
                     {
                         foreach($productBranches as $branchID => $branchName) $productBranches[$branchID] = $product->name . '/' . $branchName;
@@ -1606,8 +1606,9 @@ class project extends control
         $this->view->allStories   = $allStories;
         $this->view->prjStories   = $prjStories;
         $this->view->browseType   = $browseType;
+        $this->view->productType  = $productType;
         $this->view->users        = $this->loadModel('user')->getPairs('noletter');
-        $this->view->branchGroups = $this->loadModel('branch')->getByProducts(array_keys($products), 'noempty');
+        $this->view->branchGroups = $branchGroups;
         $this->display();
     }
 
diff --git a/module/project/view/linkstory.html.php b/module/project/view/linkstory.html.php
index b00ff22651..85121d9311 100644
--- a/module/project/view/linkstory.html.php
+++ b/module/project/view/linkstory.html.php
@@ -29,7 +29,9 @@
       <th><?php echo $lang->story->product;?></th>
       <th><?php echo $lang->story->title;?></th>
       <th><?php echo $lang->story->plan;?></th>
-      <th><?php echo $lang->branch->common;?></th>
+      <?php if($productType != 'normal'):?>
+      <th><?php echo $lang->product->branchName[$productType];?></th>
+      <?php endif;?>
       <th class='w-user'><?php echo $lang->openedByAB;?></th>
       <th class='w-80px'><?php echo $lang->story->estimateAB;?></th>
     </tr>
@@ -49,7 +51,9 @@
       <td><?php echo html::a($this->createLink('product', 'browse', "productID=$story->product&branch=$story->branch"), $products[$story->product]->name, '_blank');?></td>
       <td class='text-left nobr' title="<?php echo $story->title?>"><?php echo html::a($storyLink, $story->title);?></td>
       <td><?php echo $story->planTitle;?></td>
+      <?php if($productType != 'normal'):?>
       <td><?php if(isset($branchGroups[$story->product][$story->branch])) echo $branchGroups[$story->product][$story->branch];?></td>
+      <?php endif;?>
       <td><?php echo $users[$story->openedBy];?></td>
       <td><?php echo $story->estimate;?></td>
     </tr>
@@ -58,7 +62,7 @@
     </tbody>
     <tfoot>
       <tr>
-        <td colspan='8' class='text-left'>
+      <td colspan='<?php echo $productType == 'normal' ? '7' :'8';?>' class='text-left'>
           <div class='table-actions clearfix'>
             
           <?php