diff --git a/module/execution/model.php b/module/execution/model.php index 0feca958ae..fcd6e92a0e 100755 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -977,7 +977,7 @@ class executionModel extends model if(($status == 'suspended' and $execution->status != 'suspended') or ($status == 'closed' and $execution->status != 'closed')) { - $pointOutStages .= $this->changeStatus2Inactived($executionID, $status, $selfAndChildren); + $pointOutStages .= $this->changeStatus2Inactive($executionID, $status, $selfAndChildren); } } @@ -1054,7 +1054,7 @@ class executionModel extends model * @access public * @return string */ - public function changeStatus2Inactived($executionID, $status, $selfAndChildren) + public function changeStatus2Inactive($executionID, $status, $selfAndChildren) { $this->loadModel('programplan'); $this->loadModel('action'); diff --git a/module/execution/test/execution.class.php b/module/execution/test/execution.class.php index 26281cee8f..abea3ca231 100644 --- a/module/execution/test/execution.class.php +++ b/module/execution/test/execution.class.php @@ -399,14 +399,14 @@ class executionTest } /** - * function changeStatus2Inactived test by execution + * function changeStatus2Inactive test by execution * * @param int $executionID * @param string $status suspended|closed * @access public * @return bool|array */ - public function changeStatus2InactivedObject($executionID, $status) + public function changeStatus2InactiveObject($executionID, $status) { global $tester; @@ -421,7 +421,7 @@ class executionTest $siblingList = array(); if($executionType == 'stage') $siblingList = $siblingStages[$executionID]; - $result = $this->executionModel->changeStatus2Inactived($executionID, $status, $selfAndChildren, $siblingList); + $result = $this->executionModel->changeStatus2Inactive($executionID, $status, $selfAndChildren, $siblingList); if(dao::isError()) { diff --git a/module/execution/test/model/changestatus2inactived.php b/module/execution/test/model/changestatus2inactived.php index 9474868ddb..d0b1d3373b 100755 --- a/module/execution/test/model/changestatus2inactived.php +++ b/module/execution/test/model/changestatus2inactived.php @@ -21,7 +21,7 @@ $execution->gen(5); /** -title=测试executionModel->changeStatus2Inactived(); +title=测试executionModel->changeStatus2Inactive(); cid=1 pid=1 @@ -32,6 +32,6 @@ pid=1 */ $execution = new executionTest(); -r($execution->changeStatus2InactivedObject(2, 'suspended')) && p('') && e("'阶段a',"); // 测试修改顶级父阶段执行状态为已挂起 -r($execution->changeStatus2InactivedObject(3, 'closed')) && p('') && e("empty"); // 测试修改子阶段执行状态为已关闭 -r($execution->changeStatus2InactivedObject(4, 'closed')) && p('') && e('empty'); // 测试修改叶子阶段执行状态为已关闭 +r($execution->changeStatus2InactiveObject(2, 'suspended')) && p('') && e("'阶段a',"); // 测试修改顶级父阶段执行状态为已挂起 +r($execution->changeStatus2InactiveObject(3, 'closed')) && p('') && e("empty"); // 测试修改子阶段执行状态为已关闭 +r($execution->changeStatus2InactiveObject(4, 'closed')) && p('') && e('empty'); // 测试修改叶子阶段执行状态为已关闭