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

* Fix bug#30697.

Browse Source
This commit is contained in:
xieqiyu
2022-12-29 10:24:04 +08:00
parent 4f56a74c60
commit cb75585308
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/programplan/control.php
-2
View File
@@ -61,8 +61,6 @@ class programplan extends control
$this->commonAction($projectID, $productID, $type);
$this->session->set('projectPlanList', $this->app->getURI(true), 'project');
if(empty($productID)) $productID = $this->productID;
if(!defined('RUN_MODE') || RUN_MODE != 'api') $projectID = $this->project->saveState((int)$projectID, $this->project->getPairsByProgram());
$products = $this->loadModel('product')->getProducts($projectID);
module/programplan/model.php
+2 -2
View File
@@ -52,12 +52,12 @@ class programplanModel extends model
*/
public function getStage($executionID = 0, $productID = 0, $browseType = 'all', $orderBy = 'id_asc')
{
if(empty($executionID) || empty($productID)) return array();
if(empty($executionID)) return array();
$plans = $this->dao->select('t2.*')->from(TABLE_PROJECTPRODUCT)->alias('t1')
->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
->where('t2.type')->eq('stage')
->andWhere('t1.product')->eq($productID)
->beginIF($productID)->andWhere('t1.product')->eq($productID)->fi()
->beginIF($browseType == 'all')->andWhere('t2.project')->eq($executionID)->fi()
->beginIF($browseType == 'parent')->andWhere('t2.parent')->eq($executionID)->fi()
->beginIF(!$this->app->user->admin)->andWhere('t2.id')->in($this->app->user->view->sprints)->fi()