diff --git a/db/update18.1.sql b/db/update18.1.sql index 8f24ad812c..15ea153c8f 100644 --- a/db/update18.1.sql +++ b/db/update18.1.sql @@ -1,6 +1,6 @@ DELETE FROM `zt_config` WHERE module = 'datatable' AND section = 'executionAll'; -update `zt_task` set `assignedTo` = '' where `mode` = 'multi' and `status` != 'done' and `status` != 'closed'; +UPDATE `zt_task` SET `assignedTo` = '' WHERE `mode` = 'multi' AND `status` != 'done' AND `status` != 'closed'; REPLACE INTO `zt_lang` (`lang`, `module`, `section`, `key`, `value`, `system`, `vision`) SELECT `lang`, `module`, 'scrumClassify', `key`, `value`, `system`, `vision` FROM `zt_lang` WHERE `module` = 'process' and `section` = 'classify' and `system` = '1' ORDER BY id ASC; REPLACE INTO `zt_lang` (`lang`, `module`, `section`, `key`, `value`, `system`, `vision`) SELECT `lang`, `module`, 'agileplusClassify', `key`, `value`, `system`, `vision` FROM `zt_lang` WHERE `module` = 'process' and `section` = 'classify' and `system` = '1' ORDER BY id ASC; diff --git a/module/execution/model.php b/module/execution/model.php index d4438ce1b6..7e6ab8c702 100755 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -1120,8 +1120,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); @@ -1168,8 +1166,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);