From 95e6b9934500eab8576817da94451c65aa6b1ceb Mon Sep 17 00:00:00 2001 From: wangzemei Date: Wed, 14 Sep 2022 06:44:17 +0000 Subject: [PATCH 01/49] * 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 02/49] * 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 03/49] * 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;} + diff --git a/module/task/control.php b/module/task/control.php index e47e6d6074..aa492230fe 100755 --- a/module/task/control.php +++ b/module/task/control.php @@ -941,7 +941,11 @@ class task extends control } $execution = $this->execution->getById($task->execution); - if(!isonlybody() and $execution->type == 'kanban') return print(js::locate($this->createLink('execution', 'kanban', "executionID=$execution->id"))); + if(!isonlybody() and $execution->type == 'kanban') + { + setcookie('taskID', $taskID, 0, $this->config->webRoot, '', false, false); + return print(js::locate($this->createLink('execution', 'kanban', "executionID=$execution->id"))); + } $this->session->project = $task->project; From 13bc51eb8c11547f44ccf46360f2c7c658dd7aec Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Thu, 22 Sep 2022 08:39:12 +0800 Subject: [PATCH 08/49] * Compatible with Zen Tao's table structure. --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile b/Makefile index 1305157607..ea4e31d720 100644 --- a/Makefile +++ b/Makefile @@ -102,6 +102,11 @@ zentaoxx: mkdir zentaoxx/db/ cp zentaoxx/db_bak/upgradexuanxuan*.sql zentaoxx/db_bak/xuanxuan.sql zentaoxx/db/ rm -rf zentaoxx/db_bak/ + sed -i "s/\$$accountAdmin = \$$this->dao->select('account, admin')->from(TABLE_USER)->where('id')->eq(\$$userID)->fetch();/\$$accountAdmin = \$$this->dao->select('account')->from(TABLE_USER)->where('id')->eq(\$$userID)->fetch();\n\$$admins = \$$this->dao->select('admins')->from(TABLE_COMPANY)->where('id')->eq(\$$this->app->company->id)->fetch('admins');\n\$$adminArray = explode(',', \$$admins);\n\$$accountAdmin->admin = in_array(\$$accountAdmin->account, \$$adminArray) ? 'super' : '';\n/" zentaoxx/extension/xuan/im/model/chat.php + sed -i "/->on('tc.ownedBy=tu.account')/{ N ; s/type/tc.type/}" zentaoxx/extension/xuan/im/model/chat.php + sed -i "s/\$$super = \$$this->dao->select('admin')->from(TABLE_USER)->where('id')->eq(\$$userID)->fetch('admin');/\$$account = \$$this->dao->select('account')->from(TABLE_USER)->where('id')->eq(\$$userID)->fetch('account');\n\$$admins = \$$this->dao->select('admins')->from(TABLE_COMPANY)->where('id')->eq(\$$this->app->company->id)->fetch('admins');\n\$$adminArray = explode(',', \$$admins);\n\$$super = in_array(\$$account, \$$adminArray) ? 'super' : '';/g" zentaoxx/extension/xuan/im/control.php + sed -i "/foreach(\$$users as \$$user)/i \$$admins = \$$this->dao->select('admins')->from(TABLE_COMPANY)->where('id')->eq(\$$this->app->company->id)->fetch('admins');\$$adminArray = explode(',', \$$admins);" zentaoxx/extension/xuan/im/model/user.php + sed -i "/if(\!isset(\$$user->signed)) \$$user->signed = 0;/a \$$user->admin = in_array(\$$user->account, \$$adminArray) ? 'super' : '';" zentaoxx/extension/xuan/im/model/user.php sed -i 's/XXBVERSION/$(XVERSION)/g' zentaoxx/config/ext/_0_xuanxuan.php sed -i "/\$$config->xuanxuan->backend /c\\\$$config->xuanxuan->backend = 'zentao';" zentaoxx/config/ext/_0_xuanxuan.php sed -i 's/site,//' zentaoxx/extension/xuan/im/model/user.php From c7c4ec7429db41a289ed8766427a681acdb53100 Mon Sep 17 00:00:00 2001 From: dingyongliang Date: Wed, 21 Sep 2022 07:56:30 +0000 Subject: [PATCH 09/49] * task #70018, change bug confirmed color. --- module/bug/config.php | 2 +- module/bug/css/browse.css | 2 -- module/bug/css/m.browse.css | 4 ++-- module/bug/lang/en.php | 4 ++-- module/bug/lang/fr.php | 4 ++-- module/bug/lang/vi.php | 4 ++-- module/bug/lang/zh-cn.php | 4 ++-- module/bug/lang/zh-tw.php | 4 ++-- module/my/css/bug.css | 5 ++--- www/theme/default/style.css | 4 ++++ 10 files changed, 19 insertions(+), 18 deletions(-) diff --git a/module/bug/config.php b/module/bug/config.php index ad67ba65e3..d17bbaaa9e 100644 --- a/module/bug/config.php +++ b/module/bug/config.php @@ -188,7 +188,7 @@ $config->bug->datatable->fieldList['pri']['name'] = $lang->bug->pri; $config->bug->datatable->fieldList['confirmed']['title'] = 'confirmedAB'; $config->bug->datatable->fieldList['confirmed']['fixed'] = 'left'; -$config->bug->datatable->fieldList['confirmed']['width'] = '50'; +$config->bug->datatable->fieldList['confirmed']['width'] = '100'; $config->bug->datatable->fieldList['confirmed']['required'] = 'no'; $config->bug->datatable->fieldList['title']['title'] = 'title'; diff --git a/module/bug/css/browse.css b/module/bug/css/browse.css index 7a2518c139..55068d74be 100644 --- a/module/bug/css/browse.css +++ b/module/bug/css/browse.css @@ -2,8 +2,6 @@ .closed, .closed a {color: gray; text-decoration:line-through;} .resolved, .resolved a {color: #8EC21F; text-decoration: none;} .tree .closed, .tree .closed a {color: #003366; text-decoration: none;} -.confirm0 {color: gray;} -.confirm1 {color: green;} td.delayed {color: #fff; background: #e84e0f !important;} #bugForm .setting {height: 25px;} diff --git a/module/bug/css/m.browse.css b/module/bug/css/m.browse.css index 55fe95f277..2bade6e64b 100644 --- a/module/bug/css/m.browse.css +++ b/module/bug/css/m.browse.css @@ -1,2 +1,2 @@ -.confirm0 {color:gray; font-size:9px} -.confirm1 {color:green; font-size:9px} +.confirm0 {font-size:9px} +.confirm1 {font-size:9px} diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index 439690a04f..6b20c15b4e 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -285,8 +285,8 @@ $lang->bug->statusList['resolved'] = 'Resolved'; $lang->bug->statusList['closed'] = 'Closed'; $lang->bug->confirmedList[''] = ''; -$lang->bug->confirmedList[1] = 'Yes'; -$lang->bug->confirmedList[0] = 'No'; +$lang->bug->confirmedList[1] = 'confirmed'; +$lang->bug->confirmedList[0] = 'unconfirmed'; $lang->bug->resolutionList[''] = ''; $lang->bug->resolutionList['bydesign'] = 'As Designed'; diff --git a/module/bug/lang/fr.php b/module/bug/lang/fr.php index de0bfd7c05..ff9fd3073a 100644 --- a/module/bug/lang/fr.php +++ b/module/bug/lang/fr.php @@ -285,8 +285,8 @@ $lang->bug->statusList['resolved'] = 'Résolu'; $lang->bug->statusList['closed'] = 'Fermé'; $lang->bug->confirmedList[''] = ''; -$lang->bug->confirmedList[1] = 'Oui'; -$lang->bug->confirmedList[0] = 'Non'; +$lang->bug->confirmedList[1] = 'confirmé'; +$lang->bug->confirmedList[0] = 'non confirmé'; $lang->bug->resolutionList[''] = ''; $lang->bug->resolutionList['bydesign'] = 'Du Design'; diff --git a/module/bug/lang/vi.php b/module/bug/lang/vi.php index 2f0305172f..b21a1eed16 100644 --- a/module/bug/lang/vi.php +++ b/module/bug/lang/vi.php @@ -265,8 +265,8 @@ $lang->bug->statusList['active'] = 'Kích hoạt'; $lang->bug->statusList['resolved'] = 'Đã giải quyết'; $lang->bug->statusList['closed'] = 'Đã đóng'; -$lang->bug->confirmedList[1] = 'Có'; -$lang->bug->confirmedList[0] = 'Không'; +$lang->bug->confirmedList[1] = 'đã xác nhận'; +$lang->bug->confirmedList[0] = 'chưa được xác nhận'; $lang->bug->resolutionList[''] = ''; $lang->bug->resolutionList['bydesign'] = 'Như thiết kế'; diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php index cab71d93d5..070655bf86 100644 --- a/module/bug/lang/zh-cn.php +++ b/module/bug/lang/zh-cn.php @@ -285,8 +285,8 @@ $lang->bug->statusList['resolved'] = '已解决'; $lang->bug->statusList['closed'] = '已关闭'; $lang->bug->confirmedList[''] = ''; -$lang->bug->confirmedList[1] = '是'; -$lang->bug->confirmedList[0] = '否'; +$lang->bug->confirmedList[1] = '已确认'; +$lang->bug->confirmedList[0] = '未确认'; $lang->bug->resolutionList[''] = ''; $lang->bug->resolutionList['bydesign'] = '设计如此'; diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php index 9ac6af81b9..98fbcaaec9 100644 --- a/module/bug/lang/zh-tw.php +++ b/module/bug/lang/zh-tw.php @@ -283,8 +283,8 @@ $lang->bug->statusList['resolved'] = '已解決'; $lang->bug->statusList['closed'] = '已關閉'; $lang->bug->confirmedList[''] = ''; -$lang->bug->confirmedList[1] = '是'; -$lang->bug->confirmedList[0] = '否'; +$lang->bug->confirmedList[1] = '已確認'; +$lang->bug->confirmedList[0] = '未確認'; $lang->bug->resolutionList[''] = ''; $lang->bug->resolutionList['bydesign'] = '設計如此'; diff --git a/module/my/css/bug.css b/module/my/css/bug.css index 7cd56756df..2e23fc9a87 100644 --- a/module/my/css/bug.css +++ b/module/my/css/bug.css @@ -1,4 +1,3 @@ td.delayed {color: #fff; background: #e84e0f !important;} -.confirmed {color: #008000;} -.unconfirmed {color: #808080;} -.c-confirm {width:50px;} +.c-confirm {width:60px;} + diff --git a/www/theme/default/style.css b/www/theme/default/style.css index 6b30ab7c81..27fba89d60 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -71,6 +71,10 @@ a.showMoreImage:hover {opacity: 1;} .c-object {width: 250px;} .c-case-step {width: 300px;} .c-actions-8 {width: 240px;} + +.confirmed, .confirm1 {color: #0DBB7D;} +.unconfirmed, .confirm0 {color: gray;} + #userNav>li.open>a:before, #userNav>li>a:hover:before {position: absolute; bottom: 0px; left: calc(50% - 10px); width: 0; height: 0; content: ' '; border-color: transparent transparent #fff transparent; border-style: solid; border-width: 0 10px 10px 10px;} #userNav .dropdown-menu {z-index: 2000;} #userNav .dropdown-menu:hover + .dropdown-toggle:before {position: absolute; bottom: 0px; left: calc(50% - 10px); width: 0; height: 0; content: ' '; border-color: transparent transparent #fff transparent; border-style: solid; border-width: 0 10px 10px 10px;} From 455aa2b0a84f038a53885e314404cf10c9ff53f4 Mon Sep 17 00:00:00 2001 From: dingyongliang Date: Thu, 22 Sep 2022 01:18:01 +0000 Subject: [PATCH 10/49] * task #70025, set program title bold. --- module/program/view/browsebylist.html.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/module/program/view/browsebylist.html.php b/module/program/view/browsebylist.html.php index 53c2ce2b3e..05c3a84fc8 100644 --- a/module/program/view/browsebylist.html.php +++ b/module/program/view/browsebylist.html.php @@ -116,6 +116,9 @@ #programTableList .icon-scrum:before {content: '\e9a2';} #programTableList .icon-waterfall:before {content: '\e9a4';} #programTableList .icon-kanban:before {content: '\e983';} +#programTableList .is-top-level {font-weight: bold;} +#programTableList .has-nest-child > .c-name > a {color: #0b0f18!important;} +#programTableList .is-nest-child > .c-name > a {color: #2463C7!important;}