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

Merge branch 'sprint/183_tianshujie_19065' into 'master'

Browse Source 
* Fix bug #19065.

See merge request easycorp/zentaopms!1682
This commit is contained in:
孙广明
2022-01-27 07:36:01 +00:00
parent 5625fd1152 45cbb3d9d6
commit c120d1c85f
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/story/model.php
+6 -2
View File
@@ -2143,9 +2143,12 @@ class storyModel extends model
foreach($releases as $branch) $stages[$branch] = 'released';
$currentStory = $this->dao->findById($storyID)->from(TABLE_STORY)->fetch();
foreach($executions as $executionID => $branch)
if($story->stage != $currentStory->stage)
{
$this->kanban->updateLane($executionID, 'story', $storyID);
foreach($executions as $executionID => $branch)
{
$this->kanban->updateLane($executionID, 'story', $storyID);
}
}
if(empty($stages)) return;
@@ -2179,6 +2182,7 @@ class storyModel extends model
$this->dao->update(TABLE_STORY)->set('stage')->eq(current($stages))->where('id')->eq($storyID)->exec();
}
$currentStory = $this->dao->findById($storyID)->from(TABLE_STORY)->fetch();
if($story->stage != $currentStory->stage)
{
foreach($executions as $executionID => $branch)
module/task/model.php
+2 -2
View File
@@ -1477,8 +1477,8 @@ class taskModel extends model
if($oldTask->story) $this->loadModel('story')->setStage($oldTask->story);
$this->loadModel('kanban');
if(!isset($output['toColID'])) $this->kanban->updateLane($oldTask->execution, 'task', $taskID);
if(isset($output['toColID'])) $this->kanban->moveCard($taskID, $output['fromColID'], $output['toColID'], $output['fromLaneID'], $output['toLaneID']);
if(!isset($output['toColID']) or $task->status == 'done') $this->kanban->updateLane($oldTask->execution, 'task', $taskID);
if(isset($output['toColID']) and $task->status == 'doing') $this->kanban->moveCard($taskID, $output['fromColID'], $output['toColID'], $output['fromLaneID'], $output['toLaneID']);
if(!dao::isError()) return common::createChanges($oldTask, $task);
}