From 03326e0d24a1e76dcd46f1d69634901757fd7df4 Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Tue, 17 Nov 2020 14:23:07 +0800
Subject: [PATCH] * Fix error.

---
 module/block/view/bugblock.html.php | 2 +-
 module/bug/model.php                | 1 -
 module/product/model.php            | 1 +
 module/testcase/model.php           | 1 -
 module/testtask/model.php           | 1 -
 5 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/module/block/view/bugblock.html.php b/module/block/view/bugblock.html.php
index c9e2e700e5..e924d32762 100644
--- a/module/block/view/bugblock.html.php
+++ b/module/block/view/bugblock.html.php
@@ -53,7 +53,7 @@
       ?>
       <tr>
         <td class='c-id-xs'><?php echo sprintf('%03d', $bug->id);?></td>
-        <td class='c-name' style='color: <?php echo $bug->color?>' title='<?php echo $bug->title?>'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id", '', '', $bug->program), $bug->title)?></td>
+        <td class='c-name' style='color: <?php echo $bug->color?>' title='<?php echo $bug->title?>'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id", '', '', $bug->PRJ), $bug->title)?></td>
         <?php if($longBlock):?>
         <td class='c-severity'>
           <?php if($hasCustomSeverity):?>
diff --git a/module/bug/model.php b/module/bug/model.php
index 4b9e2443b7..1c5ef5d494 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -27,7 +27,6 @@ class bugModel extends model
      */
     public function setMenu($products, $productID, $branch = 0, $moduleID = 0, $browseType = 'unclosed', $orderBy = '')
     {
-        $this->lang->product->menu = $this->lang->product->viewMenu;
         $this->loadModel('product')->setMenu($products, $productID, $branch, $moduleID, 'bug');
         $selectHtml = $this->product->select($products, $productID, 'bug', 'browse', '', $branch, $moduleID, 'bug');
 
diff --git a/module/product/model.php b/module/product/model.php
index a8ed8f6ea5..e646553f36 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -29,6 +29,7 @@ class productModel extends model
      */
     public function setMenu($products, $productID, $branch = 0, $module = 0, $moduleType = '', $extra = '')
     {
+        $this->lang->product->menu = $this->lang->product->viewMenu;
         $product = $this->getByID($productID);
         if($product)
         {
diff --git a/module/testcase/model.php b/module/testcase/model.php
index 37de38b492..7264ac20ce 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -27,7 +27,6 @@ class testcaseModel extends model
      */
     public function setMenu($products, $productID, $branch = 0, $moduleID = 0, $suiteID = 0, $orderBy = 'id_desc')
     {
-        $this->lang->product->menu = $this->lang->product->viewMenu;
         $this->loadModel('product')->setMenu($products, $productID, $branch, $moduleID, 'case');
         $selectHtml = $this->product->select($products, $productID, 'testcase', 'browse', '', $branch, $moduleID, 'case');
 
diff --git a/module/testtask/model.php b/module/testtask/model.php
index a937d94cb8..b6665ffc63 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -23,7 +23,6 @@ class testtaskModel extends model
      */
     public function setMenu($products, $productID, $branch = 0, $testtask = 0)
     {
-        $this->lang->product->menu = $this->lang->product->viewMenu;
         $this->loadModel('product')->setMenu($products, $productID, $branch);
         $selectHtml = $this->product->select($products, $productID, 'testtask', 'browse', '', $branch);