From 95e6b9934500eab8576817da94451c65aa6b1ceb Mon Sep 17 00:00:00 2001 From: wangzemei Date: Wed, 14 Sep 2022 06:44:17 +0000 Subject: [PATCH 001/209] * task #68933 --- module/execution/view/story.html.php | 6 ++++++ module/story/config.php | 2 +- module/story/lang/zh-cn.php | 8 ++++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php index 45f9ce52d7..11b3370128 100644 --- a/module/execution/view/story.html.php +++ b/module/execution/view/story.html.php @@ -32,6 +32,12 @@ .btn-group a.btn-secondary, .btn-group a.btn-primary {border-right: 1px solid rgba(255,255,255,0.2);} .btn-group button.dropdown-toggle.btn-secondary, .btn-group button.dropdown-toggle.btn-primary {padding:6px;} .export {margin-left: 0px !important;} +#storyList .c-title { border-right: 1px solid #ededed;} +#storyList .c-pri, +#storyList .c-openedBy, +#storyList .c-stage, +#storyList .c-taskCount, +#storyList .c-actions { border-left: 1px solid #ededed;} name) or !empty($product->name) or !empty($branch)) ? false : true;?> tree->all;?> diff --git a/module/story/config.php b/module/story/config.php index a494269437..3f21a951de 100644 --- a/module/story/config.php +++ b/module/story/config.php @@ -56,7 +56,7 @@ global $lang, $app; $config->story->datatable = new stdclass(); if($app->tab == 'execution') { - $config->story->datatable->defaultField = array('id','order', 'pri', 'title', 'plan', 'openedBy', 'assignedTo', 'estimate', 'status', 'stage', 'taskCount', 'actions'); + $config->story->datatable->defaultField = array('id', 'title', 'plan', 'pri', 'status', 'openedBy', 'estimate', 'reviewedBy', 'stage', 'assignedTo', 'taskCount', 'actions'); } else { diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php index b33b955e51..36622f9b07 100644 --- a/module/story/lang/zh-cn.php +++ b/module/story/lang/zh-cn.php @@ -106,7 +106,7 @@ $lang->story->moduleAB = '模块'; $lang->story->source = "来源"; $lang->story->sourceNote = '来源备注'; $lang->story->fromBug = '来源Bug'; -$lang->story->title = "{$lang->SRCommon}名称"; +$lang->story->title = "需求名称"; $lang->story->type = "需求类型"; $lang->story->category = "类别"; $lang->story->color = '标题颜色'; @@ -126,10 +126,10 @@ $lang->story->stageAB = '阶段'; $lang->story->stagedBy = '设置阶段者'; $lang->story->mailto = '抄送给'; $lang->story->openedBy = '由谁创建'; -$lang->story->openedByAB = '创建'; +$lang->story->openedByAB = '创建者'; $lang->story->openedDate = '创建日期'; $lang->story->assignedTo = '指派给'; -$lang->story->assignedToAB = '指派'; +$lang->story->assignedToAB = '指派给'; $lang->story->assignedDate = '指派日期'; $lang->story->lastEditedBy = '最后修改'; $lang->story->lastEditedDate = '最后修改日期'; @@ -139,7 +139,7 @@ $lang->story->closedReason = '关闭原因'; $lang->story->rejectedReason = '拒绝原因'; $lang->story->changedBy = '由谁变更'; $lang->story->changedDate = '变更时间'; -$lang->story->reviewedBy = '由谁评审'; +$lang->story->reviewedBy = '评审者'; $lang->story->reviewer = $lang->story->reviewedBy; $lang->story->reviewers = '评审人员'; $lang->story->reviewedDate = '评审时间'; From a4b48d22354bdaccda89e45b9fc8b4f716deaffe Mon Sep 17 00:00:00 2001 From: wangzemei Date: Wed, 14 Sep 2022 06:47:28 +0000 Subject: [PATCH 002/209] * modify color about task #68933 --- module/execution/view/story.html.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php index 11b3370128..ebc4b69db6 100644 --- a/module/execution/view/story.html.php +++ b/module/execution/view/story.html.php @@ -32,12 +32,12 @@ .btn-group a.btn-secondary, .btn-group a.btn-primary {border-right: 1px solid rgba(255,255,255,0.2);} .btn-group button.dropdown-toggle.btn-secondary, .btn-group button.dropdown-toggle.btn-primary {padding:6px;} .export {margin-left: 0px !important;} -#storyList .c-title { border-right: 1px solid #ededed;} +#storyList .c-title { border-right: 1px solid #F2F4F7;} #storyList .c-pri, #storyList .c-openedBy, #storyList .c-stage, #storyList .c-taskCount, -#storyList .c-actions { border-left: 1px solid #ededed;} +#storyList .c-actions { border-left: 1px solid #F2F4F7;} name) or !empty($product->name) or !empty($branch)) ? false : true;?> tree->all;?> From 57d8bc7cfd4e0ed6dd12ef0555b407d4a8663ba7 Mon Sep 17 00:00:00 2001 From: wangzemei Date: Wed, 14 Sep 2022 08:46:13 +0000 Subject: [PATCH 003/209] * modify about task #68933 --- module/execution/view/story.html.php | 6 ------ module/product/view/browse.html.php | 6 ++++++ module/story/config.php | 4 ++++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php index ebc4b69db6..45f9ce52d7 100644 --- a/module/execution/view/story.html.php +++ b/module/execution/view/story.html.php @@ -32,12 +32,6 @@ .btn-group a.btn-secondary, .btn-group a.btn-primary {border-right: 1px solid rgba(255,255,255,0.2);} .btn-group button.dropdown-toggle.btn-secondary, .btn-group button.dropdown-toggle.btn-primary {padding:6px;} .export {margin-left: 0px !important;} -#storyList .c-title { border-right: 1px solid #F2F4F7;} -#storyList .c-pri, -#storyList .c-openedBy, -#storyList .c-stage, -#storyList .c-taskCount, -#storyList .c-actions { border-left: 1px solid #F2F4F7;} name) or !empty($product->name) or !empty($branch)) ? false : true;?> tree->all;?> diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index 67099b3ebe..1c3348c06c 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -41,6 +41,12 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : ''; .btn-group a i.icon-plus, .btn-group a i.icon-link {font-size: 16px;} .btn-group a.btn-secondary, .btn-group a.btn-primary {border-right: 1px solid rgba(255,255,255,0.2);} .btn-group button.dropdown-toggle.btn-secondary, .btn-group button.dropdown-toggle.btn-primary {padding:6px;} +#productStoryForm #storyList .c-title { border-right: 1px solid #F2F4F7;} +#productStoryForm #storyList .c-pri, +#productStoryForm #storyList .c-openedBy, +#productStoryForm #storyList .c-stage, +#productStoryForm #storyList .c-taskCount, +#productStoryForm #storyList .c-actions { border-left: 1px solid #F2F4F7;}