From 48c725fe44d296ca8773af7327e937f32b7a4556 Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Fri, 18 Dec 2020 11:27:19 +0800
Subject: [PATCH] * Adjust code.

---
 module/bug/control.php                     | 6 +++---
 module/product/view/showerrornone.html.php | 2 +-
 module/productplan/view/linkbug.html.php   | 2 +-
 module/productplan/view/view.html.php      | 2 +-
 module/story/view/track.html.php           | 2 +-
 module/testcase/model.php                  | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index 744893d9e5..b4556bebd8 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -31,8 +31,8 @@ class bug extends control
         $this->loadModel('action');
         $this->loadModel('story');
         $this->loadModel('task');
-        $this->view->products = $this->products = $this->product->getProductPairsByProject($this->session->PRJ);
 
+        $this->view->products = $this->products = $this->product->getProductPairsByProject($this->session->PRJ);
         if(empty($this->products)) die($this->locate($this->createLink('product', 'showErrorNone', "fromModule=bug")));
     }
 
@@ -598,13 +598,13 @@ class bug extends control
 
         /* Get product info. */
         $productID   = $bug->product;
-        $productName = $this->products[$productID];
+        $productName = isset($this->products[$productID]) ? $this->products[$productID] : '';
         $branches    = $this->session->currentProductType == 'normal' ? array() : $this->loadModel('branch')->getPairs($bug->product);
 
         $this->executeHooks($bugID);
 
         /* Header and positon. */
-        $this->view->title      = "BUG #$bug->id $bug->title - " . $this->products[$productID];
+        $this->view->title      = "BUG #$bug->id $bug->title - " . $productName;
         $this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID"), $productName);
         $this->view->position[] = $this->lang->bug->view;
 
diff --git a/module/product/view/showerrornone.html.php b/module/product/view/showerrornone.html.php
index fe749b95d9..c19aa47663 100644
--- a/module/product/view/showerrornone.html.php
+++ b/module/product/view/showerrornone.html.php
@@ -11,7 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<?php if($fromModule != 'product'):?>
+<?php if($fromModule != 'product' && !empty($project)):?>
 <div class="table-empty-tip">
   <p><span class="text-muted"><?php echo $lang->product->noProduct;?></span> <?php common::printLink('program', 'PRJManageProducts', "projectID=$project->id&programID=$project->parent", "<i class='icon icon-plus'></i> " . $lang->program->PRJManageProducts, '', "class='btn btn-info'");?></p>
 </div>
diff --git a/module/productplan/view/linkbug.html.php b/module/productplan/view/linkbug.html.php
index f4a5f65650..f5a9175854 100644
--- a/module/productplan/view/linkbug.html.php
+++ b/module/productplan/view/linkbug.html.php
@@ -42,7 +42,7 @@
             <?php echo html::checkbox('bugs', array($bug->id => sprintf('%03d', $bug->id)));?>
           </td>
           <td><span class='label-pri label-pri-<?php echo $bug->pri;?>' title='<?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?></span></td>
-          <td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id", '', true), $bug->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?></td>
+          <td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id", '', true, $bug->PRJ), $bug->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?></td>
           <td><?php echo zget($users, $bug->openedBy);?></td>
           <td><?php echo zget($users, $bug->assignedTo);?></td>
           <td>
diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php
index 8a192f8492..2ecfb9f2c6 100644
--- a/module/productplan/view/view.html.php
+++ b/module/productplan/view/view.html.php
@@ -392,7 +392,7 @@
                   <?php endif;?>
                 </td>
                 <td><span class='label-pri label-pri-<?php echo $bug->pri;?>' title='<?php echo zget($lang->bug->priList, $bug->pri, $bug->pri);?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri);?></span></td>
-                <td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?></td>
+                <td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id", '', false, $bug->PRJ), $bug->title);?></td>
                 <td><?php echo zget($users, $bug->openedBy);?></td>
                 <td><?php echo zget($users, $bug->assignedTo);?></td>
                 <td>
diff --git a/module/story/view/track.html.php b/module/story/view/track.html.php
index 7176c86fa6..96e3fc9cf7 100644
--- a/module/story/view/track.html.php
+++ b/module/story/view/track.html.php
@@ -51,7 +51,7 @@
               </td>
               <td>
                 <?php foreach($story->case as $caseID => $case):?>
-                <?php echo html::a($this->createLink('testcase', 'view', "caseID=$caseID"), $case->title, '', "title='$case->title'") . '<br/>';?> 
+                <?php echo html::a($this->createLink('testcase', 'view', "caseID=$caseID", '', false, $case->PRJ), $case->title, '', "title='$case->title'") . '<br/>';?> 
                 <?php endforeach;?>
               </td>
               <td>
diff --git a/module/testcase/model.php b/module/testcase/model.php
index f96178707b..1cad66fefe 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -559,7 +559,7 @@ class testcaseModel extends model
      */
     public function getStoryCases($storyID)
     {
-        return $this->dao->select('id, title, pri, type, status, lastRunner, lastRunDate, lastRunResult')
+        return $this->dao->select('id, PRJ, title, pri, type, status, lastRunner, lastRunDate, lastRunResult')
             ->from(TABLE_CASE)
             ->where('story')->eq((int)$storyID)
             ->andWhere('deleted')->eq(0)