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

* Refactor, suspend execution page.

Browse Source
This commit is contained in:
tianshujie
2023-06-19 09:40:05 +08:00
parent 7d33f83356
commit 09a31edb96
2 changed files with 56 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+7 -10
View File
@@ -2283,7 +2283,7 @@ class execution extends control
* @access public
* @return void
*/
public function suspend($executionID, $from = 'execution')
public function suspend(int $executionID, string $from = 'execution')
{
$execution = $this->commonAction($executionID);
$executionID = $execution->id;
@@ -2294,7 +2294,7 @@ class execution extends control
$this->loadModel('action');
$this->execution->computeBurn($executionID);
$changes = $this->execution->suspend($executionID);
if(dao::isError()) return print(js::error(dao::getError()));
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
if($this->post->comment != '' or !empty($changes))
{
@@ -2306,14 +2306,11 @@ class execution extends control
if($project->model == 'waterfall' or $project->model == 'waterfallplus') $this->loadModel('programplan')->computeProgress($executionID, 'suspend');
$this->executeHooks($executionID);
if(isonlybody() and $from == 'kanban')
{
return print(js::closeModal('parent.parent', '', "parent.parent.changeStatus('suspended')"));
}
else
{
return print(js::reload('parent.parent'));
}
$response['closeModal'] = true;
$response['load'] = true;
if($from == 'kanban') $response['callback'] = "changeStatus('doing')";
return $this->sendSuccess($response);
}
$this->view->title = $this->view->execution->name . $this->lang->colon .$this->lang->execution->suspend;