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

* Recode programplan getParentStageList.

Browse Source
This commit is contained in:
tanghucheng
2023-09-14 04:22:09 -04:00
parent 1207d32a86
commit 8f471a760b
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/programplan/control.php
+1 -1
View File
@@ -285,7 +285,7 @@ class programplan extends control
$this->view->isCreateTask = $this->programplan->isCreateTask($planID);
$this->view->plan = $plan;
$this->view->project = $this->project->getByID($plan->project);
$this->view->parentStageList = $this->programplan->getParentStageList($this->session->project, $planID, $plan->product);
$this->view->parentStageList = $this->programplan->getParentStageList($plan->project, $planID, $plan->product);
$this->view->enableOptionalAttr = (empty($parentStage) or (!empty($parentStage) and $parentStage->attribute == 'mix'));
$this->view->isTopStage = $this->programplan->checkTopStage($planID);
$this->view->isLeafStage = $this->programplan->checkLeafStage($planID);
module/programplan/model.php
+13 -9
View File
@@ -1585,15 +1585,19 @@ class programplanModel extends model
*/
public function getParentStageList($executionID, $planID, $productID)
{
$parentStage = $this->dao->select('t2.id, t2.name')->from(TABLE_PROJECTPRODUCT)
->alias('t1')->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
->where('t1.product')->eq($productID)
->andWhere('t2.project')->eq($executionID)
->andWhere('t2.type')->eq('stage')
->andWhere('t2.deleted')->eq(0)
->andWhere('t2.path')->notlike("%,$planID,%")
->beginIF(!$this->app->user->admin)->andWhere('t2.id')->in($this->app->user->view->sprints)->fi()
->orderBy('t2.id desc')
$parentStage = $this->dao->select('t1.id, t1.name')->from(TABLE_PROJECT)->alias('t1')
->beginIF($productID)
->leftJoin(TABLE_PROJECTPRODUCT)->alias('t2')->on('t1.id = t2.project')
->fi()
->where('t1.project')->eq($executionID)
->beginIF($productID)
->andWhere('t2.product')->eq($productID)
->fi()
->andWhere('t1.type')->eq('stage')
->andWhere('t1.deleted')->eq(0)
->andWhere('t1.path')->notlike("%,$planID,%")
->beginIF(!$this->app->user->admin)->andWhere('t1.id')->in($this->app->user->view->sprints)->fi()
->orderBy('t1.id desc')
->fetchPairs();
$plan = $this->getByID($planID);