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

* Finish task#4796.

Browse Source
This commit is contained in:
滔哥
2018-09-27 22:30:07 +08:00
parent 72ba0ddf1e
commit 12e366d54d
4 changed files with 129 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/control.php
+25 -4
View File
@@ -256,7 +256,7 @@ class task extends control
$this->view->moduleID = $moduleID;
$this->display();
}
/**
* Common actions of task module.
*
@@ -320,7 +320,14 @@ class task extends control
}
}
}
die(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
if(defined('RUN_MODE') && RUN_MODE == 'api')
{
die(array('status' => 'success', 'data' => $taskID));
}
else
{
die(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
}
}
$noclosedProjects = $this->project->getPairs('noclosed,nocode');
@@ -801,7 +808,14 @@ class task extends control
}
}
if(isonlybody()) die(js::closeModal('parent.parent', 'this'));
die(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
if(defined('RUN_MODE') && RUN_MODE == 'api')
{
die(array('status' => 'success', 'data' => $taskID));
}
else
{
die(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
}
}
$task = $this->view->task;
@@ -923,7 +937,14 @@ class task extends control
$this->action->logHistory($actionID, $changes);
}
if(isonlybody()) die(js::closeModal('parent.parent', 'this'));
die(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
if(defined('RUN_MODE') && RUN_MODE == 'api')
{
die(array('status' => 'success', 'data' => $taskID));
}
else
{
die(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
}
}
$this->view->title = $this->view->project->name . $this->lang->colon .$this->lang->task->finish;