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

* Refactoring the Kanban function.

Browse Source
This commit is contained in:
tianshujie
2021-10-26 10:25:33 +08:00
parent 546edae92a
commit a71cacdaa8
5 changed files with 193 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+3 -3
View File
@@ -78,7 +78,7 @@ class executionModel extends model
global $lang;
$this->app->loadLang('project');
$lang->executionCommon = $lang->project->stage;
include $this->app->getModulePath('execution') . 'lang/' . $this->app->getClientLang() . '.php';
include $this->app->getModulePath('', 'execution') . 'lang/' . $this->app->getClientLang() . '.php';
}
if($execution and $execution->lifetime == 'ops')
@@ -379,7 +379,7 @@ class executionModel extends model
$creatorExists = false;
$teamMembers = array();
$this->loadModel('kanban')->addKanbanLanes($executionID);
$this->loadModel('kanban')->createLane($executionID);
/* Save order. */
$this->dao->update(TABLE_EXECUTION)->set('`order`')->eq($executionID * 5)->where('id')->eq($executionID)->exec();
@@ -3156,7 +3156,7 @@ class executionModel extends model
*/
public function getKanbanTasks($executionID, $orderBy = 'status_asc, id_desc', $pager = null)
{
$tasks = $this->dao->select('t1.*, t1.id as id, t2.id AS storyID, t2.title AS storyTitle, t2.version AS latestStoryVersion, t2.status AS storyStatus, t3.realname AS assignedToRealName')
$tasks = $this->dao->select('t1.*, t2.id AS storyID, t2.title AS storyTitle, t2.version AS latestStoryVersion, t2.status AS storyStatus, t3.realname AS assignedToRealName')
->from(TABLE_TASK)->alias('t1')
->leftJoin(TABLE_STORY)->alias('t2')->on('t1.story = t2.id')
->leftJoin(TABLE_USER)->alias('t3')->on('t1.assignedTo = t3.account')