Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Code for task#43902.

Browse Source
This commit is contained in:
xieqiyu
2021-11-08 13:53:16 +08:00
parent acf5b15c06
commit 866c7adc75
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/branch/model.php
-2
View File
@@ -98,8 +98,6 @@ class branchModel extends model
$branches = array('all' => $this->lang->branch->all, '0' => $this->lang->branch->main) + $branches;
}
if(strpos($params, 'noall') !== false) unset($branches['all']);
return $branches;
}
module/story/control.php
+2 -2
View File
@@ -313,7 +313,7 @@ class story extends control
$this->view->color = $color;
$this->view->pri = $pri;
$this->view->branch = $branch;
$this->view->branches = $product->type != 'normal' ? $this->loadModel('branch')->getPairs($productID, 'active|noall') : array();
$this->view->branches = $product->type != 'normal' ? $this->loadModel('branch')->getPairs($productID, 'active') : array();
$this->view->productID = $productID;
$this->view->product = $product;
$this->view->objectID = $objectID;
@@ -627,7 +627,7 @@ class story extends control
$this->view->users = $users;
$this->view->product = $product;
$this->view->products = $myProducts + $othersProducts;
$this->view->branches = $product->type == 'normal' ? array() : $this->loadModel('branch')->getPairs($story->product, 'noall');
$this->view->branches = $product->type == 'normal' ? array() : $this->loadModel('branch')->getPairs($story->product);
$this->view->reviewers = implode(',', $reviewerList);
$this->view->reviewedReviewer = $reviewedReviewer;
$this->view->isShowReviewer = $isShowReviewer;