From 547ecde44dcd16bef66aa8c10e93499a750b6706 Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Wed, 11 Nov 2020 16:11:27 +0800
Subject: [PATCH] * Finish task #8194.

---
 module/common/model.php               | 3 ++-
 module/project/view/bug.html.php      | 6 ++----
 module/project/view/build.html.php    | 6 ++----
 module/project/view/testtask.html.php | 2 +-
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/module/common/model.php b/module/common/model.php
index 4bf899e77e..1c3f7efca3 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -1857,7 +1857,8 @@ EOD;
         /* Check the product is closed. */
         if(!empty($object->product) and !empty($config->global->closedProductStatus))
         {
-            $product = $app->control->loadModel('product')->getByID($object->product);
+            $productID = trim($object->product, ',');
+            $product   = $app->control->loadModel('product')->getByID($productID);
             if($product->status == 'closed') return true;
 
             /* Get the projects associated with the story. */
diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php
index 8e5f21e524..e5005c6be9 100644
--- a/module/project/view/bug.html.php
+++ b/module/project/view/bug.html.php
@@ -22,9 +22,7 @@
   </div>
   <div class="btn-toolbar pull-right">
     <?php common::printLink('bug', 'export', "productID=$productID&orderBy=$orderBy&browseType=&projectID=$project->id", "<i class='icon icon-export muted'> </i>" . $lang->bug->export, '', "class='btn btn-link export'");?>
-    <?php if(empty($this->config->global->closedProjectStatus) or $project->status != 'closed'):?>
-    <?php common::printLink('bug', 'create', "productID=$productID&branch=$branchID&extra=projectID=$project->id", "<i class='icon icon-plus'></i> " . $lang->bug->create, '', "class='btn btn-primary'");?>
-    <?php endif;?>
+    <?php if(empty($this->config->global->closedProjectStatus) or $project->status != 'closed') common::printLink('bug', 'create', "productID=$productID&branch=$branchID&extra=projectID=$project->id", "<i class='icon icon-plus'></i> " . $lang->bug->create, '', "class='btn btn-primary'");?>
   </div>
 </div>
 <div id="mainContent">
@@ -33,7 +31,7 @@
   <div class="table-empty-tip">
     <p>
       <span class="text-muted"><?php echo $lang->bug->noBug;?></span>
-      <?php if(common::hasPriv('bug', 'create')):?>
+      <?php if((empty($this->config->global->closedProjectStatus) or $project->status != 'closed') and common::hasPriv('bug', 'create')):?>
       <?php echo html::a($this->createLink('bug', 'create', "productID=$productID&branch=$branchID&extra=projectID=$project->id"), "<i class='icon icon-plus'></i> " . $lang->bug->create, '', "class='btn btn-info'");?>
       <?php endif;?>
     </p>
diff --git a/module/project/view/build.html.php b/module/project/view/build.html.php
index 3f87eb6e43..ead308f52a 100644
--- a/module/project/view/build.html.php
+++ b/module/project/view/build.html.php
@@ -29,9 +29,7 @@
   </div>
     <a class="btn btn-link querybox-toggle" id="bysearchTab"><i class="icon icon-search muted"></i> <?php echo $lang->project->byQuery;?></a>
   <div class="btn-toolbar pull-right">
-    <?php if(empty($this->config->global->closedProjectStatus) or $project->status != 'closed'):?>
-    <?php common::printLink('build', 'create', "project=$project->id", "<i class='icon icon-plus'></i> " . $lang->build->create, '', "class='btn btn-primary'");?>
-    <?php endif;?>
+    <?php if(empty($this->config->global->closedProjectStatus) or $project->status != 'closed') common::printLink('build', 'create', "project=$project->id", "<i class='icon icon-plus'></i> " . $lang->build->create, '', "class='btn btn-primary'");?>
   </div>
 </div>
 <div id="mainContent">
@@ -40,7 +38,7 @@
   <div class="table-empty-tip">
     <p>
       <span class="text-muted"><?php echo $lang->build->noBuild;?></span>
-      <?php if(common::hasPriv('build', 'create')):?>
+      <?php if((empty($this->config->global->closedProjectStatus) or $project->status != 'closed') and common::hasPriv('build', 'create')):?>
       <?php echo html::a($this->createLink('build', 'create', "project=$project->id"), "<i class='icon icon-plus'></i> " . $lang->build->create, '', "class='btn btn-info'");?>
       <?php endif;?>
     </p>
diff --git a/module/project/view/testtask.html.php b/module/project/view/testtask.html.php
index 3667a0f2b5..a468348743 100644
--- a/module/project/view/testtask.html.php
+++ b/module/project/view/testtask.html.php
@@ -39,7 +39,7 @@
   <div class="table-empty-tip">
     <p>
       <span class="text-muted"><?php echo $lang->testtask->noTesttask;?></span>
-      <?php if(common::hasPriv('testtask', 'create')):?>
+      <?php if((empty($this->config->global->closedProjectStatus) or $project->status != 'closed') and common::hasPriv('testtask', 'create')):?>
       <?php echo html::a($this->createLink('testtask', 'create', "product=0&project=$projectID"), "<i class='icon icon-plus'></i> " . $lang->testtask->create, '', "class='btn btn-info'");?>
       <?php endif;?>
     </p>