From 18cf9473da6d759c16ae41817b8f82f393d86ed8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= Date: Mon, 28 May 2018 08:41:45 +0800 Subject: [PATCH 1/5] * Finish task#4258 --- module/testcase/view/groupcase.html.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/module/testcase/view/groupcase.html.php b/module/testcase/view/groupcase.html.php index 016de6373d..56a5e3e61c 100644 --- a/module/testcase/view/groupcase.html.php +++ b/module/testcase/view/groupcase.html.php @@ -89,7 +89,9 @@ $groupName");?> - + +
testcase->allTestcases;?>
+ From 32a07c24509c505656c15329c4be309058539003 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= Date: Mon, 28 May 2018 08:55:26 +0800 Subject: [PATCH 2/5] * Finish task#4271 --- module/project/view/story.html.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/module/project/view/story.html.php b/module/project/view/story.html.php index 7c39a91608..b386de820a 100644 --- a/module/project/view/story.html.php +++ b/module/project/view/story.html.php @@ -197,7 +197,11 @@ - + +
+

product->noStory;?> id", " " . $lang->project->linkStory, '', "class='btn btn-info'");?>

+
+
@@ -230,7 +234,7 @@ ?>
- createLink('project', 'batchUnlinkStory', "projectID=$project->id"); @@ -293,6 +297,9 @@ $(function() .replace('%rate%', rate); } }); + + $("#main").addClass('hide-sidebar'); + }); From f7825494094f07f228895d7ce5b58fbc891b33f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= Date: Mon, 28 May 2018 09:07:21 +0800 Subject: [PATCH 3/5] * Finish task#4267 --- module/story/view/view.html.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php index b15b4d108d..8e156301c2 100644 --- a/module/story/view/view.html.php +++ b/module/story/view/view.html.php @@ -30,7 +30,7 @@ for($i = $story->version; $i >= 1; $i --) { $class = $i == $version ? " class='active'" : ''; - echo '' . html::a(inlink('view', "storyID=$story->id&version=$i"), '#' . $i) . ''; + echo '' . html::a(inlink('view', "storyID=$story->id&version=$i"), '#' . $i) . ''; } ?> @@ -325,11 +325,11 @@
+
";?> deleted):?> -
id", $story); - common::printIcon('story', 'review', "storyID=$story->id", $story); + common::printIcon('story', 'change', "storyID=$story->id", $story, '', '', '', 'showinonlybody'); + common::printIcon('story', 'review', "storyID=$story->id", $story, '', '', '', 'showinonlybody'); if($story->status != 'closed' and !isonlybody()) { $misc = "class='btn' data-toggle='modal' data-type='iframe' data-width='95%'"; @@ -337,8 +337,8 @@ if(common::hasPriv('story', 'batchCreate')) echo html::a($link, " " . $lang->story->subdivide, '', $misc); } - common::printIcon('story', 'close', "storyID=$story->id", $story, 'button', '', '', 'iframe', true); - common::printIcon('story', 'activate', "storyID=$story->id", $story, 'button', '', '', 'iframe', true); + common::printIcon('story', 'close', "storyID=$story->id", $story, 'button', '', '', 'iframe showinonlybody', true); + common::printIcon('story', 'activate', "storyID=$story->id", $story, 'button', '', '', 'iframe showinonlybody', true); if($this->config->global->flow != 'onlyStory' and !isonlybody() and (common::hasPriv('testcase', 'create') or common::hasPriv('testcase', 'batchCreate'))) { @@ -359,11 +359,11 @@ echo ""; } - if($from == 'project') common::printIcon('task', 'create', "project=$param&storyID=$story->id&moduleID=$story->module", $story, 'button', 'smile'); + if($from == 'project') common::printIcon('task', 'create', "project=$param&storyID=$story->id&moduleID=$story->module", $story, 'button', 'smile', '', 'showinonlybody'); echo "
"; - common::printIcon('story', 'edit', "storyID=$story->id", $story); - common::printIcon('story', 'create', "productID=$story->product&branch=$story->branch&moduleID=$story->module&storyID=$story->id", $story, 'button', 'copy'); + common::printIcon('story', 'edit', "storyID=$story->id", $story, '', '', '', 'iframe showinonlybody'); + common::printIcon('story', 'create', "productID=$story->product&branch=$story->branch&moduleID=$story->module&storyID=$story->id", $story, 'button', 'copy', '', 'iframe showinonlybody'); common::printIcon('story', 'delete', "storyID=$story->id", $story, 'button', '', 'hiddenwin'); ?> From 330d8d1e991c8f971cfcfa01e54e31f644289580 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= Date: Mon, 28 May 2018 09:20:06 +0800 Subject: [PATCH 4/5] * Finish task#4254 --- module/bug/lang/en.php | 6 +++--- module/bug/lang/zh-cn.php | 6 +++--- module/bug/view/create.html.php | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index f3a1a6c135..15d60a3739 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -171,9 +171,9 @@ $lang->bug->hasSubmittedTest = 'Development has submitted test application, $lang->bug->nowToTest = 'Now to test'; /* 模板。*/ -$lang->bug->tplStep = "

[Steps]

\n"; -$lang->bug->tplResult = "

[Results]

\n"; -$lang->bug->tplExpect = "

[Expectations]

"; +$lang->bug->tplStep = "

[Steps]


"; +$lang->bug->tplResult = "

[Results]


"; +$lang->bug->tplExpect = "

[Expectations]


"; /* 各个字段取值列表。*/ $lang->bug->severityList[3] = '3'; diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php index f1c39f24a2..3a647035e7 100644 --- a/module/bug/lang/zh-cn.php +++ b/module/bug/lang/zh-cn.php @@ -171,9 +171,9 @@ $lang->bug->hasSubmittedTest = '开发已提交测试申请，'; $lang->bug->nowToTest = '现在去测试'; /* 模板。*/ -$lang->bug->tplStep = "

[步骤]

"; -$lang->bug->tplResult = "

[结果]

"; -$lang->bug->tplExpect = "

[期望]

"; +$lang->bug->tplStep = "

[步骤]


"; +$lang->bug->tplResult = "

[结果]


"; +$lang->bug->tplExpect = "

[期望]


"; /* 各个字段取值列表。*/ $lang->bug->severityList[3] = '3'; diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php index b6e080f212..35b0ceff1c 100644 --- a/module/bug/view/create.html.php +++ b/module/bug/view/create.html.php @@ -112,9 +112,9 @@ js::set('confirmDeleteTemplate', $lang->bug->confirmDeleteTemplate); } ?> - bug->severityList, $severity, "class='form-control chosen'");?> + bug->severityList, $severity, "class='form-control chosen'");?> - bug->severityList, $severity, "class='form-control' data-provide='labelSelector' data-label-class='label-severity'");?> + bug->severityList, $severity, "class='form-control' data-provide='labelSelector' data-label-class='label-severity'");?> @@ -141,9 +141,9 @@ js::set('confirmDeleteTemplate', $lang->bug->confirmDeleteTemplate); } ?> - + - + From fc39b0702fac07598329c13ffda2c30473f1fbf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= Date: Mon, 28 May 2018 09:24:13 +0800 Subject: [PATCH 5/5] * Finish task#4250 --- module/action/lang/zh-cn.php | 14 +++++++------- module/tree/lang/zh-cn.php | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index 406e24df91..0d5c61a830 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -206,7 +206,7 @@ $lang->action->label->bug = 'Bug|bug|view|bugID=%s'; $lang->action->label->case = '用例|testcase|view|caseID=%s'; $lang->action->label->testtask = '测试单|testtask|view|caseID=%s'; $lang->action->label->testsuite = '测试套件|testsuite|view|suiteID=%s'; -$lang->action->label->caselib = '测试库|testsuite|libview|libID=%s'; +$lang->action->label->caselib = '用例库|testsuite|libview|libID=%s'; $lang->action->label->todo = '待办|todo|view|todoID=%s'; $lang->action->label->doclib = '文档库|doc|browse|libID=%s'; $lang->action->label->doc = '文档|doc|view|docID=%s'; @@ -217,17 +217,17 @@ $lang->action->label->webhook = 'Webhook|webhook|browse|'; $lang->action->label->space = ' '; /* Object type. */ -$lang->action->search->objectTypeList[''] = ''; +$lang->action->search->objectTypeList[''] = ''; $lang->action->search->objectTypeList['product'] = $lang->productCommon; $lang->action->search->objectTypeList['project'] = $lang->projectCommon; $lang->action->search->objectTypeList['bug'] = 'Bug'; -$lang->action->search->objectTypeList['case'] = '用例'; +$lang->action->search->objectTypeList['case'] = '用例'; $lang->action->search->objectTypeList['caseresult'] = '用例结果'; $lang->action->search->objectTypeList['stepresult'] = '用例步骤'; -$lang->action->search->objectTypeList['story'] = '需求'; -$lang->action->search->objectTypeList['task'] = '任务'; -$lang->action->search->objectTypeList['testtask'] = '测试单'; -$lang->action->search->objectTypeList['user'] = '用户'; +$lang->action->search->objectTypeList['story'] = '需求'; +$lang->action->search->objectTypeList['task'] = '任务'; +$lang->action->search->objectTypeList['testtask'] = '测试单'; +$lang->action->search->objectTypeList['user'] = '用户'; $lang->action->search->objectTypeList['doc'] = '文档'; $lang->action->search->objectTypeList['doclib'] = '文档库'; $lang->action->search->objectTypeList['todo'] = '待办'; diff --git a/module/tree/lang/zh-cn.php b/module/tree/lang/zh-cn.php index 6302eba226..7f630d8b3c 100644 --- a/module/tree/lang/zh-cn.php +++ b/module/tree/lang/zh-cn.php @@ -22,7 +22,7 @@ $lang->tree->manageProject = "维护{$lang->projectCommon}视图模块"; $lang->tree->manageLine = '维护产品线'; $lang->tree->manageBug = '维护测试视图模块'; $lang->tree->manageCase = '维护用例视图模块'; -$lang->tree->manageCaseLib = '维护测试库模块'; +$lang->tree->manageCaseLib = '维护用例库模块'; $lang->tree->manageCustomDoc = '维护文档库分类'; $lang->tree->updateOrder = '更新排序'; $lang->tree->manageChild = '维护子模块'; @@ -30,7 +30,7 @@ $lang->tree->manageStoryChild = '维护子模块'; $lang->tree->manageLineChild = '维护产品线'; $lang->tree->manageBugChild = '维护Bug子模块'; $lang->tree->manageCaseChild = '维护用例子模块'; -$lang->tree->manageCaselibChild = '维护测试库子模块'; +$lang->tree->manageCaselibChild = '维护用例库子模块'; $lang->tree->manageTaskChild = "维护{$lang->projectCommon}子模块"; $lang->tree->syncFromProduct = '复制模块'; $lang->tree->dragAndSort = "拖放排序";