Merge branch 'master_feedback_1468' into 'master'

Master feedback 1468

See merge request easycorp/zentaopms!6251
This commit is contained in:
王怡栋
2022-11-18 07:22:01 +00:00
4 changed files with 28 additions and 5 deletions
+6 -2
View File
@@ -1243,8 +1243,12 @@ class bug extends control
$branchProduct = $product->type == 'normal' ? false : true;
/* Set plans. */
$plans = $this->loadModel('productplan')->getPairs($productID, $branch, '', true);
$plans = array('' => '', 'ditto' => $this->lang->bug->ditto) + $plans;
foreach($bugs as $bug)
{
$plans = $this->loadModel('productplan')->getPairs($productID, $bug->branch, '', true);
$plans = array('' => '', 'ditto' => $this->lang->bug->ditto) + $plans;
$bug->plans = $plans;
}
/* Set branches and modules. */
$branches = 0;