From 3afc82317760b640967b9650582a8f039f82e38b Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Wed, 23 Nov 2022 15:34:30 +0800
Subject: [PATCH] * Fix bug#29716,#30056.

---
 module/my/model.php                      | 6 +++---
 module/projectrelease/view/edit.html.php | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/module/my/model.php b/module/my/model.php
index d8424c070a..996f2c9137 100644
--- a/module/my/model.php
+++ b/module/my/model.php
@@ -351,7 +351,7 @@ class myModel extends model
         {
             $orderBy    = (strpos($orderBy, 'priOrder') !== false or strpos($orderBy, 'severityOrder') !== false) ? $orderBy : "t1.$orderBy";
             $nameField  = $objectType == 'bug' ? 'productName' : 'productTitle';
-            $select     = "t1.*, t2.name AS {$nameField}, t2.shadow, " . (strpos($orderBy, 'severity') !== false ? "IF(t1.`severity` = 0, {$this->config->maxPriValue}, t1.`severity`) AS severityOrder" : "IF(t1.`pri` = 0, {$this->config->maxPriValue}, t1.`pri`) AS priOrder");
+            $select     = "t1.*, t2.name AS {$nameField}, t2.shadow AS shadow, " . (strpos($orderBy, 'severity') !== false ? "IF(t1.`severity` = 0, {$this->config->maxPriValue}, t1.`severity`) AS severityOrder" : "IF(t1.`pri` = 0, {$this->config->maxPriValue}, t1.`pri`) AS priOrder");
             $objectList = $this->dao->select($select)->from($this->config->objectTables[$module])->alias('t1')
                 ->leftJoin(TABLE_PRODUCT)->alias('t2')->on("t1.product = t2.id")
                 ->where('t1.deleted')->eq(0)
@@ -816,7 +816,7 @@ class myModel extends model
                 $storyIDList[$storyID] = $storyID;
             }
 
-            $stories = $this->dao->select("distinct t1.*, IF(t1.`pri` = 0, {$this->config->maxPriValue}, t1.`pri`) as priOrder, t2.name as productTitle, t4.title as planTitle")->from(TABLE_STORY)->alias('t1')
+            $stories = $this->dao->select("distinct t1.*, IF(t1.`pri` = 0, {$this->config->maxPriValue}, t1.`pri`) as priOrder, t2.name as productTitle, t2.shadow as shadow, t4.title as planTitle")->from(TABLE_STORY)->alias('t1')
                 ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id')
                 ->leftJoin(TABLE_PLANSTORY)->alias('t3')->on('t1.id = t3.plan')
                 ->leftJoin(TABLE_PRODUCTPLAN)->alias('t4')->on('t3.plan = t4.id')
@@ -835,7 +835,7 @@ class myModel extends model
         }
         else
         {
-            $stories = $this->dao->select("distinct t1.*, IF(t1.`pri` = 0, {$this->config->maxPriValue}, t1.`pri`) as priOrder, t2.name as productTitle, t4.title as planTitle")->from(TABLE_STORY)->alias('t1')
+            $stories = $this->dao->select("distinct t1.*, IF(t1.`pri` = 0, {$this->config->maxPriValue}, t1.`pri`) as priOrder, t2.name as productTitle, t2.shadow as shadow, t4.title as planTitle")->from(TABLE_STORY)->alias('t1')
                 ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id')
                 ->leftJoin(TABLE_PLANSTORY)->alias('t3')->on('t1.id = t3.plan')
                 ->leftJoin(TABLE_PRODUCTPLAN)->alias('t4')->on('t3.plan = t4.id')
diff --git a/module/projectrelease/view/edit.html.php b/module/projectrelease/view/edit.html.php
index ddccf35e5c..3374c74a78 100644
--- a/module/projectrelease/view/edit.html.php
+++ b/module/projectrelease/view/edit.html.php
@@ -27,6 +27,7 @@
           <tr>
             <th class='w-120px'><?php echo $lang->release->name;?></th>
             <td><?php echo html::input('name', $release->name, "class='form-control' required");?></td>
+            <?php if(!$product->shadow):?>
             <td>
               <?php $checked = !empty($release->marker) ? "checked='checked'" : '';?>
               <div id='markerBox' class='checkbox-primary'>
@@ -34,6 +35,7 @@
                 <label for='marker'><?php echo $lang->release->marker;?></label>
               </div>
             </td>
+            <?php endif;?>
           </tr>
           <tr>
             <th><?php echo $lang->release->includedBuild;?></th>