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

* Fix bug #18640,18646.

Browse Source
This commit is contained in:
tianshujie
2022-01-18 11:09:01 +08:00
parent d39aa0ecbb
commit 470801b6aa
2 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
module/bug/js/create.js
View File

@@ -103,14 +103,8 @@ $(function()
oldOpenedBuild = '';
oldTaskID = $('#oldTaskID').val() || 0;
if(parseInt($('#execution').val()))
{
loadExecutionRelated($('#execution').val());
}
else
{
if(parseInt($('#project').val())) loadProjectTeamMembers($('#project').val());
}
loadExecutionRelated($('#execution').val());
if(parseInt($('#project').val()) && !parseInt($('#execution').val())) loadProjectTeamMembers($('#project').val());
if(!assignedto) setTimeout(function(){setAssignedTo(moduleID, productID)}, 500);
notice();

19
module/kanban/model.php
View File

@@ -2088,18 +2088,15 @@ class kanbanModel extends model
$execution = $this->loadModel('execution')->getByID($executionID);
if($execution->type == 'kanban')
{
$regionIdList = $this->dao->select('id')->from(TABLE_KANBANREGION)
->where('deleted')->eq(0)
->andWhere('kanban')->eq($executionID)
->fetchPairs();
$lanes = $this->dao->select('t1.*')->from(TABLE_KANBANLANE)->alias('t1')
->leftJoin(TABLE_KANBANCELL)->alias('t2')->on('t1.id=t2.lane')
$lanes = $this->dao->select('t2.*')->from(TABLE_KANBANREGION)->alias('t1')
->leftJoin(TABLE_KANBANLANE)->alias('t2')->on('t1.id=t2.region')
->leftJoin(TABLE_KANBANCELL)->alias('t3')->on('t2.id=t3.lane')
->where('t1.deleted')->eq(0)
->andWhere('t1.execution')->eq($executionID)
->andWhere('t1.type')->eq($laneType)
->andWhere('t1.region')->in($regionIdList)
->beginIF(!empty($cardID))->andWhere('t2.cards')->like("%,$cardID,%")->fi()
->andWhere('t2.deleted')->eq(0)
->andWhere('t1.kanban')->eq($executionID)
->andWhere('t2.execution')->eq($executionID)
->andWhere('t2.type')->eq($laneType)
->beginIF(!empty($cardID))->andWhere('t3.cards')->like("%,$cardID,%")->fi()
->orderBy('t1.`order` asc')
->fetchAll('id');