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

Merge branch 'master_xieqiyu_19273' into 'master'

Browse Source 
* Fix bug#19273.

See merge request easycorp/zentaopms!2666
This commit is contained in:
孙广明
2022-03-31 07:24:15 +00:00
parent 50f370f185 6551f617c6
commit 4e2f0a3d86
4 changed files with 54 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/control.php
+7 -4
View File
@@ -442,10 +442,11 @@ class task extends control
*
* @param int $taskID
* @param bool $comment
* @param string $kanbanGroup
* @access public
* @return void
*/
public function edit($taskID, $comment = false)
public function edit($taskID, $comment = false, $kanbanGroup = '')
{
$this->commonAction($taskID);
@@ -494,7 +495,7 @@ class task extends control
if(isonlybody())
{
$execution = $this->execution->getByID($task->execution);
if($execution->type == 'kanban' and $this->app->tab == 'execution')
if($execution->type == 'kanban' and $this->app->tab == 'execution' and $kanbanGroup == 'default')
{
$kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all');
$kanbanData = json_encode($kanbanData);
@@ -681,10 +682,12 @@ class task extends control
* Update assign of task
*
* @param int $requestID
* @param int $taskID
* @param string $kanbanGroup
* @access public
* @return void
*/
public function assignTo($executionID, $taskID)
public function assignTo($executionID, $taskID, $kanbanGroup = '')
{
$this->commonAction($taskID);
@@ -709,7 +712,7 @@ class task extends control
{
$task = $this->task->getById($taskID);
$execution = $this->execution->getByID($task->execution);
if($execution->type == 'kanban' and $this->app->tab == 'execution')
if($execution->type == 'kanban' and $this->app->tab == 'execution' and $kanbanGroup == 'default')
{
$kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all');
$kanbanData = json_encode($kanbanData);