diff --git a/module/testcase/config/action.php b/module/testcase/config/action.php index 066d366574..01b24d4a50 100644 --- a/module/testcase/config/action.php +++ b/module/testcase/config/action.php @@ -26,10 +26,11 @@ $config->testcase->actionList['edit']['text'] = $lang->testcase->edit; $config->testcase->actionList['edit']['hint'] = $lang->testcase->edit; $config->testcase->actionList['edit']['url'] = array('module' => 'testcase', 'method' => 'edit', 'params' => 'caseID={id}&comment=false&executionID=%executionID%'); -$config->testcase->actionList['review']['icon'] = 'glasses'; -$config->testcase->actionList['review']['text'] = $lang->testcase->review; -$config->testcase->actionList['review']['hint'] = $lang->testcase->review; -$config->testcase->actionList['review']['url'] = array('module' => 'testcase', 'method' => 'review', 'params' => 'caseID={id}'); +$config->testcase->actionList['review']['icon'] = 'glasses'; +$config->testcase->actionList['review']['text'] = $lang->testcase->review; +$config->testcase->actionList['review']['hint'] = $lang->testcase->review; +$config->testcase->actionList['review']['url'] = array('module' => 'testcase', 'method' => 'review', 'params' => 'caseID={id}'); +$config->testcase->actionList['review']['data-toggle'] = 'modal'; $config->testcase->actionList['createBug']['icon'] = 'bug'; $config->testcase->actionList['createBug']['text'] = $lang->testcase->createBug; diff --git a/module/testcase/control.php b/module/testcase/control.php index 7b718c4d39..05aac0c620 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -1229,7 +1229,7 @@ class testcase extends control if($_POST) { $changes = $this->testcase->review($caseID); - if(dao::isError()) return print(js::error(dao::getError())); + if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError())); if(is_array($changes)) { @@ -1239,13 +1239,14 @@ class testcase extends control $this->executeHooks($caseID); - return print(js::reload('parent.parent')); + return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'load' => true)); } } - $this->view->users = $this->user->getPairs('noletter|noclosed|nodeleted'); - $this->view->case = $this->testcase->getById($caseID); - $this->view->actions = $this->loadModel('action')->getList('case', $caseID); + $this->view->testcase = $this->testcase->getByID($caseID); + $this->view->users = $this->user->getPairs('noletter|noclosed|nodeleted'); + $this->view->case = $this->testcase->getById($caseID); + $this->view->actions = $this->loadModel('action')->getList('case', $caseID); $this->display(); } diff --git a/module/testcase/lang/de.php b/module/testcase/lang/de.php index 4ff86e8608..4c7e5b44b3 100644 --- a/module/testcase/lang/de.php +++ b/module/testcase/lang/de.php @@ -118,6 +118,7 @@ $lang->testcase->deleteAction = "Löschen Case"; $lang->testcase->view = "Übersicht"; $lang->testcase->review = "Prüfung"; $lang->testcase->reviewAB = "Prüfung"; +$lang->testcase->reviewAction = "Review Case"; $lang->testcase->batchReview = "Mehrere Prüfungfen"; $lang->testcase->edit = "Bearbeiten"; $lang->testcase->batchEdit = "Mehrere bearbeiten "; diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php index 65d228551c..ce93a49d5b 100644 --- a/module/testcase/lang/en.php +++ b/module/testcase/lang/en.php @@ -118,6 +118,7 @@ $lang->testcase->deleteAction = "Delete Case"; $lang->testcase->view = "Case Detail"; $lang->testcase->review = "Need Review"; $lang->testcase->reviewAB = "Review"; +$lang->testcase->reviewAction = "Review Case"; $lang->testcase->batchReview = "Batch Review"; $lang->testcase->edit = "Edit Case"; $lang->testcase->batchEdit = "Batch Edit "; diff --git a/module/testcase/lang/fr.php b/module/testcase/lang/fr.php index 5766d414f1..a4fdc1b495 100644 --- a/module/testcase/lang/fr.php +++ b/module/testcase/lang/fr.php @@ -118,6 +118,7 @@ $lang->testcase->deleteAction = "Supprimer CasTest"; $lang->testcase->view = "Détail CasTest"; $lang->testcase->review = "Doit être validé"; $lang->testcase->reviewAB = "Validation"; +$lang->testcase->reviewAction = "Review Case"; $lang->testcase->batchReview = "Validation par Lot"; $lang->testcase->edit = "Modifier CasTest"; $lang->testcase->batchEdit = "Modifier par Lot "; diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php index 912c492a97..acb9bc05a7 100644 --- a/module/testcase/lang/zh-cn.php +++ b/module/testcase/lang/zh-cn.php @@ -118,6 +118,7 @@ $lang->testcase->deleteAction = "删除用例"; $lang->testcase->view = "用例详情"; $lang->testcase->review = "评审"; $lang->testcase->reviewAB = "评审"; +$lang->testcase->reviewAction = "评审用例"; $lang->testcase->batchReview = "批量评审"; $lang->testcase->edit = "编辑用例"; $lang->testcase->batchEdit = "批量编辑 "; diff --git a/module/testcase/ui/review.html.php b/module/testcase/ui/review.html.php new file mode 100644 index 0000000000..4dd85a07da --- /dev/null +++ b/module/testcase/ui/review.html.php @@ -0,0 +1,64 @@ + + * @package testcase + * @link https://www.zentao.net + */ +namespace zin; + +modalHeader(); + +form +( + formGroup + ( + set::width('1/3'), + set::label($lang->testcase->reviewedDateAB), + input + ( + set::name('reviewedDate'), + set::type('date'), + set::value(helper::today()), + ) + ), + formGroup + ( + set::width('1/3'), + set::label($lang->testcase->reviewResultAB), + set::required(true), + select + ( + set::name('result'), + set::items($lang->testcase->reviewResultList), + ) + ), + formGroup + ( + set::label($lang->testcase->reviewedByAB), + select + ( + set::name('reviewedBy[]'), + set::value($app->user->account), + set::items($users), + set::multiple(true), + ) + ), + formGroup + ( + set::label($lang->comment), + editor + ( + set::name('comment'), + set::rows(8) + ) + ), + set::actions(array('submit')), +); + +history(); + +render('modalDialog');