diff --git a/module/action/lang/de.php b/module/action/lang/de.php index 634ca10092..5365e567e4 100644 --- a/module/action/lang/de.php +++ b/module/action/lang/de.php @@ -242,9 +242,10 @@ $lang->action->desc->linked2bug = '$date Verknüpft mit $extra $lang->action->desc->linked2testtask = '$date, linked to $extra by $actor'; $lang->action->desc->unlinkedfromtesttask = '$date, unlinked from $extra by $actor'; $lang->action->desc->resolved = '$date, resolved by $actor ' . "\n"; -$lang->action->desc->managed = '$date, by $actor managed.' . "\n"; -$lang->action->desc->estimated = '$date, by $actor estimated.' . "\n"; -$lang->action->desc->run = '$date, by $actor executed.' . "\n"; +$lang->action->desc->managed = '$date, managed by $actor.' . "\n"; +$lang->action->desc->estimated = '$date, estimated by $actor.' . "\n"; +$lang->action->desc->run = '$date, executed by $actor.' . "\n"; +$lang->action->desc->runresult = '$date, executed by $actor%s, the results is %s.' . "\n"; $lang->action->desc->syncprogram = '$date, started by $actor(starting the project sets the program status as Ongoing).' . "\n"; $lang->action->desc->syncproject = '$date, starting the execution sets the ' . $lang->projectCommon . ' status as Ongoing.' . "\n"; $lang->action->desc->syncmultipleproject = '$date, starting the task sets the ' . $lang->projectCommon . ' status as Ongoing.' . "\n"; diff --git a/module/action/lang/en.php b/module/action/lang/en.php index 67041179e1..c18fa3595d 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -242,9 +242,10 @@ $lang->action->desc->linked2bug = '$date, linked to $extraaction->desc->linked2testtask = '$date, linked to $extra by $actor'; $lang->action->desc->unlinkedfromtesttask = '$date, unlinked from $extra by $actor'; $lang->action->desc->resolved = '$date, resolved by $actor ' . "\n"; -$lang->action->desc->managed = '$date, by $actor managed.' . "\n"; -$lang->action->desc->estimated = '$date, by $actor estimated.' . "\n"; -$lang->action->desc->run = '$date, by $actor executed.' . "\n"; +$lang->action->desc->managed = '$date, managed by $actor.' . "\n"; +$lang->action->desc->estimated = '$date, estimated by $actor.' . "\n"; +$lang->action->desc->run = '$date, executed by $actor.' . "\n"; +$lang->action->desc->runresult = '$date, executed by $actor%s, the results is %s.' . "\n"; $lang->action->desc->syncprogram = '$date, started by $actor(starting the project sets the program status as Ongoing).' . "\n"; $lang->action->desc->syncproject = '$date, starting the execution sets the ' . $lang->projectCommon . ' status as Ongoing.' . "\n"; $lang->action->desc->syncmultipleproject = '$date, starting the task sets the ' . $lang->projectCommon . ' status as Ongoing.' . "\n"; diff --git a/module/action/lang/fr.php b/module/action/lang/fr.php index 1768fdaafe..a344b6389a 100644 --- a/module/action/lang/fr.php +++ b/module/action/lang/fr.php @@ -242,9 +242,10 @@ $lang->action->desc->linked2bug = '$date, affecté à $extraaction->desc->linked2testtask = '$date, linked to $extra by $actor'; $lang->action->desc->unlinkedfromtesttask = '$date, unlinked from $extra by $actor'; $lang->action->desc->resolved = '$date, resolved by $actor ' . "\n"; -$lang->action->desc->managed = '$date, by $actor managed.' . "\n"; -$lang->action->desc->estimated = '$date, by $actor estimated.' . "\n"; -$lang->action->desc->run = '$date, by $actor executed.' . "\n"; +$lang->action->desc->managed = '$date, managed by $actor.' . "\n"; +$lang->action->desc->estimated = '$date, estimated by $actor.' . "\n"; +$lang->action->desc->run = '$date, executed by $actor.' . "\n"; +$lang->action->desc->runresult = '$date, executed by $actor%s, the results is %s.' . "\n"; $lang->action->desc->syncprogram = '$date, started by $actor(starting the project sets the program status as Ongoing).' . "\n"; $lang->action->desc->syncproject = '$date, starting the execution sets the ' . $lang->projectCommon . ' status as Ongoing.' . "\n"; $lang->action->desc->syncmultipleproject = '$date, starting the task sets the ' . $lang->projectCommon . ' status as Ongoing.' . "\n"; diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index 493ba30778..b7d28410a1 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -245,6 +245,7 @@ $lang->action->desc->resolved = '$date, 由 $actor $lang->action->desc->managed = '$date, 由 $actor 维护。' . "\n"; $lang->action->desc->estimated = '$date, 由 $actor 估算。' . "\n"; $lang->action->desc->run = '$date, 由 $actor 执行。' . "\n"; +$lang->action->desc->runresult = '$date, 由 $actor 执行%s,结果为 %s。' . "\n"; $lang->action->desc->syncprogram = '$date, 由 $actor 启动(因' . $lang->projectCommon . '开始而启动项目集)。' . "\n"; $lang->action->desc->syncproject = '$date, 系统判断由于' . $lang->executionCommon .'开始,将' . $lang->projectCommon . '状态置为进行中。' . "\n"; $lang->action->desc->syncmultipleproject = '$date, 系统判断由于任务开始,将' . $lang->projectCommon . '状态置为进行中。' . "\n"; diff --git a/module/action/model.php b/module/action/model.php index c0ce70827f..c60f8a5578 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -694,6 +694,22 @@ class actionModel extends model } } } + elseif($action->action == 'run' && $action->objectType == 'case' && strpos($action->extra, ',') !== false) + { + list($testtaskID, $result) = explode(',', $action->extra); + if($result) + { + $link = ''; + $testtask = $this->dao->select('name')->from(TABLE_TESTTASK)->where('id')->eq($testtaskID)->fetch(); + if($testtask) $link = common::hasPriv('testtask', 'cases') ? html::a(helper::createLink('testtask', 'cases', "testtaskID=$testtaskID"), ' ' . $testtask->name) : ' ' . $testtask->name; + if(!isset($this->lang->testcase->resultList)) $this->app->loadLang('testcase'); + $desc = sprintf($this->lang->action->desc->runresult, "{$link}", $result, zget($this->lang->testcase->resultList, $result)); + } + else + { + $desc = $this->lang->action->desc->run; + } + } elseif(isset($this->lang->action->desc->{$actionType})) { $desc = $this->lang->action->desc->{$actionType}; diff --git a/module/testtask/control.php b/module/testtask/control.php index 3e1e824bd4..52534ef742 100644 --- a/module/testtask/control.php +++ b/module/testtask/control.php @@ -883,7 +883,7 @@ class testtask extends control $caseResult = $this->testtask->createResult($runID, (int)$this->post->case, (int)$this->post->version, $stepResults, $deployID); if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError())); - $this->loadModel('action')->create('case', $caseID, 'run', '', zget($run, 'task', 0)); + $this->loadModel('action')->create('case', $caseID, 'run', '', zget($run, 'task', '0') . ',' . $caseResult); $this->testtaskZen->responseAfterRunCase($caseResult, $preAndNext, $run, $caseID, $version); return $this->send(array('result' => 'success', 'load' => true, 'closeModal' => true));