Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Refactor the review view.

Browse Source
This commit is contained in:
daitingting
2023-06-26 01:28:53 +00:00
parent 35102af09e
commit 8df51c2a07
7 changed files with 79 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/config/action.php
+5 -4
View File
@@ -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;
module/testcase/control.php
+6 -5
View File
@@ -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();
}
module/testcase/lang/de.php
+1
View File
@@ -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 ";
module/testcase/lang/en.php
+1
View File
@@ -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 ";
module/testcase/lang/fr.php
+1
View File
@@ -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 ";
module/testcase/lang/zh-cn.php
+1
View File
@@ -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 = "批量编辑 ";
module/testcase/ui/review.html.php
+64
View File
@@ -0,0 +1,64 @@
<?php
declare(strict_types=1);
/**
* The review view file of testcase module of ZenTaoPMS.
* @copyright Copyright 2009-2023 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.zentao.net)
* @license ZPL(https://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
* @author Tingting Dai <daitingting@easycorp.ltd>
* @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');