From ed9f6d1875dff05091a4dfae4536a491e278f4ff Mon Sep 17 00:00:00 2001 From: chenfei Date: Tue, 7 Jul 2020 09:06:38 +0800 Subject: [PATCH 1/4] * Fix bug #3205. --- module/file/view/export2html.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/file/view/export2html.html.php b/module/file/view/export2html.html.php index b8b33660ea..e2e3b55deb 100644 --- a/module/file/view/export2html.html.php +++ b/module/file/view/export2html.html.php @@ -19,7 +19,7 @@ table th,table td{padding:5px;} <?php echo $fileName;?> -post->kind == 'task') echo "" . $this->lang->file->childTaskTag . '';?> +post->kind == 'task') echo "" . $this->lang->file->childTaskTips . '';?> Date: Tue, 7 Jul 2020 09:37:50 +0800 Subject: [PATCH 2/4] * Fix bug #3194. --- module/story/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/story/model.php b/module/story/model.php index 69fc6a0919..2f4ad51403 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -1535,7 +1535,7 @@ class storyModel extends model if($statusList['devel']['done'] == $develTasks and $develTasks > 0 and $statusList['test']['wait'] > 0 and $statusList['test']['done'] > 0) $stage = 'testing'; if($statusList['test']['doing'] > 0) $stage = 'testing'; if(($statusList['devel']['wait'] > 0 or $statusList['devel']['doing'] > 0) and $statusList['test']['done'] == $testTasks and $testTasks > 0) $stage = 'testing'; - if($statusList['devel']['done'] == $develTasks and $develTasks > 0 and $statusList['test']['done'] == $testTasks and $testTasks > 0) $stage = 'tested'; + if($statusList['devel']['done'] == $develTasks and $statusList['test']['done'] == $testTasks and $testTasks > 0) $stage = 'tested'; $stages[$branch] = $stage; } From 604a766d012c4eab37473979c4fa42da125bac3e Mon Sep 17 00:00:00 2001 From: chenfei Date: Tue, 7 Jul 2020 10:03:51 +0800 Subject: [PATCH 3/4] * Fix bug #3192. --- module/common/lang/de.php | 6 +++++- module/common/lang/en.php | 6 +++++- module/common/lang/fr.php | 6 +++++- module/common/lang/vi.php | 6 +++++- module/common/lang/zh-cn.php | 6 +++++- 5 files changed, 25 insertions(+), 5 deletions(-) diff --git a/module/common/lang/de.php b/module/common/lang/de.php index 07291cb106..4caeeae450 100644 --- a/module/common/lang/de.php +++ b/module/common/lang/de.php @@ -337,7 +337,6 @@ $lang->testreport->menu->caselib = array('link' => 'Bibliothek|caselib|browse' $lang->caselib = new stdclass(); $lang->caselib->menu = new stdclass(); -$lang->caselib->subMenu = $lang->qa->subMenu; $lang->caselib->menu->bug = array('link' => 'Bug|bug|browse|'); $lang->caselib->menu->testcase = array('link' => 'Fälle|testcase|browse|', 'class' => 'dropdown dropdown-hover'); $lang->caselib->menu->testtask = array('link' => 'Build|testtask|browse|'); @@ -345,6 +344,11 @@ $lang->caselib->menu->testsuite = array('link' => 'Suite|testsuite|browse|'); $lang->caselib->menu->report = array('link' => 'Berichte|testreport|browse|'); $lang->caselib->menu->caselib = array('link' => 'Bibliothek|caselib|browse|libID=%s', 'alias' => 'create,createcase,view,edit,batchcreatecase,showimport', 'subModule' => 'tree,testcase'); +$lang->caselib->subMenu = new stdclass(); +$lang->caselib->subMenu->testcase = new stdclass(); +$lang->caselib->subMenu->testcase->feature = array('link' => 'Functional Test|testcase|browse', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase,importfromlib', 'subModule' => 'tree,story'); +$lang->caselib->subMenu->testcase->unit = array('link' => 'Unit Test|testtask|browseUnits'); + $lang->ci = new stdclass(); $lang->ci->menu = new stdclass(); $lang->ci->menu->code = array('link' => 'Code|repo|browse|repoID=%s', 'alias' => 'diff,view,revision,log,blame,showsynccomment'); diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 4b666f4866..e8d5f8529e 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -337,7 +337,6 @@ $lang->testreport->menu->caselib = array('link' => 'Case Library|caselib|brows $lang->caselib = new stdclass(); $lang->caselib->menu = new stdclass(); -$lang->caselib->subMenu = $lang->qa->subMenu; $lang->caselib->menu->bug = array('link' => 'Bug|bug|browse|'); $lang->caselib->menu->testcase = array('link' => 'Case|testcase|browse|', 'class' => 'dropdown dropdown-hover'); $lang->caselib->menu->testtask = array('link' => 'Request|testtask|browse|'); @@ -345,6 +344,11 @@ $lang->caselib->menu->testsuite = array('link' => 'Suite|testsuite|browse|'); $lang->caselib->menu->report = array('link' => 'Report|testreport|browse|'); $lang->caselib->menu->caselib = array('link' => 'Case Library|caselib|browse|libID=%s', 'alias' => 'create,createcase,view,edit,batchcreatecase,showimport', 'subModule' => 'tree,testcase'); +$lang->caselib->subMenu = new stdclass(); +$lang->caselib->subMenu->testcase = new stdclass(); +$lang->caselib->subMenu->testcase->feature = array('link' => 'Functional Test|testcase|browse', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase,importfromlib', 'subModule' => 'tree,story'); +$lang->caselib->subMenu->testcase->unit = array('link' => 'Unit Test|testtask|browseUnits'); + $lang->ci = new stdclass(); $lang->ci->menu = new stdclass(); $lang->ci->menu->code = array('link' => 'Code|repo|browse|repoID=%s', 'alias' => 'diff,view,revision,log,blame,showsynccomment'); diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php index 510c77883a..cf44340ada 100644 --- a/module/common/lang/fr.php +++ b/module/common/lang/fr.php @@ -337,7 +337,6 @@ $lang->testreport->menu->caselib = array('link' => 'Library Recette|caselib|br $lang->caselib = new stdclass(); $lang->caselib->menu = new stdclass(); -$lang->caselib->subMenu = $lang->qa->subMenu; $lang->caselib->menu->bug = array('link' => 'Bug|bug|browse|'); $lang->caselib->menu->testcase = array('link' => 'CasTest|testcase|browse|', 'class' => 'dropdown dropdown-hover'); $lang->caselib->menu->testtask = array('link' => 'Recette|testtask|browse|'); @@ -345,6 +344,11 @@ $lang->caselib->menu->testsuite = array('link' => 'Cahier Recette|testsuite|brow $lang->caselib->menu->report = array('link' => 'Rapport|testreport|browse|'); $lang->caselib->menu->caselib = array('link' => 'Library Recette|caselib|browse|libID=%s', 'alias' => 'create,createcase,view,edit,batchcreatecase,showimport', 'subModule' => 'tree,testcase'); +$lang->caselib->subMenu = new stdclass(); +$lang->caselib->subMenu->testcase = new stdclass(); +$lang->caselib->subMenu->testcase->feature = array('link' => 'Functional Test|testcase|browse', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase,importfromlib', 'subModule' => 'tree,story'); +$lang->caselib->subMenu->testcase->unit = array('link' => 'Unit Test|testtask|browseUnits'); + $lang->ci = new stdclass(); $lang->ci->menu = new stdclass(); $lang->ci->menu->code = array('link' => 'Code|repo|browse|repoID=%s', 'alias' => 'diff,view,revision,log,blame,showsynccomment'); diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php index 2d17922192..f5e4cebc70 100644 --- a/module/common/lang/vi.php +++ b/module/common/lang/vi.php @@ -337,7 +337,6 @@ $lang->testreport->menu->caselib = array('link' => 'Thư viện tình huống| $lang->caselib = new stdclass(); $lang->caselib->menu = new stdclass(); -$lang->caselib->subMenu = $lang->qa->subMenu; $lang->caselib->menu->bug = array('link' => 'Bug|bug|browse|'); $lang->caselib->menu->testcase = array('link' => 'Tình huống|testcase|browse|', 'class' => 'dropdown dropdown-hover'); $lang->caselib->menu->testtask = array('link' => 'Yêu cầu|testtask|browse|'); @@ -345,6 +344,11 @@ $lang->caselib->menu->testsuite = array('link' => 'Suite|testsuite|browse|'); $lang->caselib->menu->report = array('link' => 'Báo cáo|testreport|browse|'); $lang->caselib->menu->caselib = array('link' => 'Thư viện tình huống|caselib|browse|libID=%s', 'alias' => 'create,createcase,view,edit,batchcreatecase,showimport', 'subModule' => 'tree,testcase'); +$lang->caselib->subMenu = new stdclass(); +$lang->caselib->subMenu->testcase = new stdclass(); +$lang->caselib->subMenu->testcase->feature = array('link' => 'Functional Test|testcase|browse', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase,importfromlib', 'subModule' => 'tree,story'); +$lang->caselib->subMenu->testcase->unit = array('link' => 'Unit Test|testtask|browseUnits'); + $lang->ci = new stdclass(); $lang->ci->menu = new stdclass(); $lang->ci->menu->code = array('link' => 'Code|repo|browse|repoID=%s', 'alias' => 'diff,view,revision,log,blame,showsynccomment'); diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 22bb562525..7a7400803d 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -337,7 +337,6 @@ $lang->testreport->menu->caselib = array('link' => '用例库|caselib|browse') $lang->caselib = new stdclass(); $lang->caselib->menu = new stdclass(); -$lang->caselib->subMenu = $lang->qa->subMenu; $lang->caselib->menu->bug = array('link' => 'Bug|bug|browse|'); $lang->caselib->menu->testcase = array('link' => '用例|testcase|browse|', 'class' => 'dropdown dropdown-hover'); $lang->caselib->menu->testtask = array('link' => '测试单|testtask|browse|'); @@ -345,6 +344,11 @@ $lang->caselib->menu->testsuite = array('link' => '套件|testsuite|browse|'); $lang->caselib->menu->report = array('link' => '报告|testreport|browse|'); $lang->caselib->menu->caselib = array('link' => '用例库|caselib|browse|libID=%s', 'alias' => 'create,createcase,view,edit,batchcreatecase,showimport', 'subModule' => 'tree,testcase'); +$lang->caselib->subMenu = new stdclass(); +$lang->caselib->subMenu->testcase = new stdclass(); +$lang->caselib->subMenu->testcase->feature = array('link' => '功能测试|testcase|browse', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase,importfromlib', 'subModule' => 'tree,story'); +$lang->caselib->subMenu->testcase->unit = array('link' => '单元测试|testtask|browseUnits'); + $lang->ci = new stdclass(); $lang->ci->menu = new stdclass(); $lang->ci->menu->code = array('link' => '代码|repo|browse|repoID=%s', 'alias' => 'diff,view,revision,log,blame,showsynccomment'); From f314de7e59c8807226fcc33fbb2e1c909ac51338 Mon Sep 17 00:00:00 2001 From: chenfei Date: Tue, 7 Jul 2020 10:56:06 +0800 Subject: [PATCH 4/4] * Fix bug #3181. --- module/caselib/model.php | 15 +++++++-------- module/caselib/view/batchcreatecase.html.php | 6 +++--- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/module/caselib/model.php b/module/caselib/model.php index cdbfd1e1e6..c8965bac3a 100644 --- a/module/caselib/model.php +++ b/module/caselib/model.php @@ -581,15 +581,14 @@ class caselibModel extends model $this->loadModel('testcase'); $this->loadModel('action'); - $now = helper::now(); - $libID = (int)$libID; - $cases = fixer::input('post')->get(); - $batchNum = count(reset($cases)); + $now = helper::now(); + $libID = (int)$libID; + $cases = fixer::input('post')->get(); $result = $this->loadModel('common')->removeDuplicate('case', $cases, "lib={$libID}"); $cases = $result['data']; - for($i = 0; $i < $batchNum; $i++) + foreach($cases->title as $i => $title) { if(!empty($cases->title[$i]) and empty($cases->type[$i])) die(js::alert(sprintf($this->lang->error->notempty, $this->lang->testcase->type))); } @@ -597,18 +596,18 @@ class caselibModel extends model $module = 0; $type = ''; $pri = 3; - for($i = 0; $i < $batchNum; $i++) + foreach($cases->title as $i => $title) { $module = $cases->module[$i] == 'ditto' ? $module : $cases->module[$i]; $type = $cases->type[$i] == 'ditto' ? $type : $cases->type[$i]; - $pri = $cases->pri[$i] == 'ditto' ? $pri : $cases->pri[$i]; + $pri = $cases->pri[$i] == 'ditto' ? $pri : $cases->pri[$i]; $cases->module[$i] = (int)$module; $cases->type[$i] = $type; $cases->pri[$i] = $pri; } $forceNotReview = $this->testcase->forceNotReview(); - for($i = 0; $i < $batchNum; $i++) + foreach($cases->title as $i => $title) { if($cases->type[$i] != '' and $cases->title[$i] != '') { diff --git a/module/caselib/view/batchcreatecase.html.php b/module/caselib/view/batchcreatecase.html.php index 86c08b124f..bfe069ad6c 100644 --- a/module/caselib/view/batchcreatecase.html.php +++ b/module/caselib/view/batchcreatecase.html.php @@ -75,7 +75,7 @@
- + - - + +
%s @@ -91,8 +91,8 @@ testcase->typeList, $type, "class='form-control chosen'");?>testcase->priList, $pri, "class=form-control chosen");?>testcase->priList, $pri, "class='form-control chosen'");?> testcase->stageList, '', "class='form-control chosen' multiple");?>