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

Merge branch 'sprint/182_liumengyi_47340' into 'kanban'

Browse Source 
* Finish task #47340.When adding kanban execution, create region, group, lanes and columns.

See merge request easycorp/zentaopms!1344
This commit is contained in:
孙广明
2022-01-11 07:53:14 +00:00
parent 8cf613ac6b ec74445096
commit 62b7f5eac1
13 changed files with 1462 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/model.php
+2 -2
View File
@@ -1834,7 +1834,7 @@ class projectModel extends model
->fetchPairs();
}
$executions = $this->dao->select('t1.*,t2.name projectName')->from(TABLE_EXECUTION)->alias('t1')
$executions = $this->dao->select('t1.*,t2.name projectName, t2.model as projectModel')->from(TABLE_EXECUTION)->alias('t1')
->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
->where('t1.type')->in('sprint,stage')
->beginIF($projectID != 0)->andWhere('t1.project')->eq($projectID)->fi()
@@ -1849,7 +1849,7 @@ class projectModel extends model
}
else
{
$executions = $this->dao->select('t2.*,t3.name projectName')->from(TABLE_PROJECTPRODUCT)->alias('t1')
$executions = $this->dao->select('t2.*,t3.name projectName, t3.model as projectModel')->from(TABLE_PROJECTPRODUCT)->alias('t1')
->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.project=t2.id')
->leftJoin(TABLE_PROJECT)->alias('t3')->on('t2.project=t3.id')
->where('t1.product')->eq($productID)