Merge branch 'sprint/hufangzhou_formatcode' into 'master'

* Format the code and remove type restriction when batch change execution's status.

See merge request easycorp/zentaopms!7112
This commit is contained in:
王怡栋
2023-03-01 10:15:45 +00:00
2 changed files with 1 additions and 5 deletions
-4
View File
@@ -1118,8 +1118,6 @@ class executionModel extends model
$actionID = $this->action->create('execution', $executionID, 'Started');
$this->action->logHistory($actionID, $changes);
if($type != 'stage') return '';
/* This stage has a parent stage. */
$checkTopStage = $this->programplan->checkTopStage($executionID);
if(!$checkTopStage) $this->programplan->computeProgress($executionID);
@@ -1166,8 +1164,6 @@ class executionModel extends model
$actionID = $this->action->create('execution', $executionID, strtoupper($status));
$this->action->logHistory($actionID, $changes);
if($type != 'stage') return '';
/* Suspended: When all child stages at the same level are suspended or closed, the status of the parent stage becomes "suspended". */
/* Closed: When all child stages at the same level are closed, the status of the parent stage becomes "closed". */
$checkTopStage = $this->programplan->checkTopStage($executionID);