From c3244b958ff0a0cc89854342b1eb46d2a0bf0c6b Mon Sep 17 00:00:00 2001 From: Lufei Date: Mon, 19 Dec 2022 16:36:14 +0800 Subject: [PATCH 08/14] * Fix search style error in execution view page. --- module/execution/view/view.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/execution/view/view.html.php b/module/execution/view/view.html.php index 6178455394..91a3cf4d8d 100644 --- a/module/execution/view/view.html.php +++ b/module/execution/view/view.html.php @@ -10,9 +10,9 @@ * @link http://www.zentao.net */ ?> -config->webRoot . 'js/echarts/echarts.common.min.js'); ?> +config->webRoot . 'js/echarts/echarts.common.min.js'); ?> execution->count); ?> From 1014829f3bd3de8bd4ad9d86b754817bd926d67d Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Mon, 19 Dec 2022 17:01:54 +0800 Subject: [PATCH 09/14] * Code for task #79631. --- module/block/lang/de.php | 8 ++++++ module/block/lang/en.php | 8 ++++++ module/block/lang/fr.php | 8 ++++++ module/block/lang/zh-cn.php | 8 ++++++ module/block/view/guide.html.php | 30 ++++++++++++++++++++++- www/theme/default/images/guide/ALM.png | Bin 0 -> 12937 bytes www/theme/default/images/guide/light.png | Bin 0 -> 9861 bytes 7 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 www/theme/default/images/guide/ALM.png create mode 100644 www/theme/default/images/guide/light.png diff --git a/module/block/lang/de.php b/module/block/lang/de.php index 615ae698a0..f0d98437ac 100644 --- a/module/block/lang/de.php +++ b/module/block/lang/de.php @@ -622,3 +622,11 @@ $lang->block->themes['pink'] = 'Pink'; $lang->block->themes['blackberry'] = 'Blackberry'; $lang->block->themes['classic'] = 'Classic'; $lang->block->themes['purple'] = 'Purple'; + +$lang->block->customModes['light'] = 'Light Mode'; +$lang->block->customModes['ALM'] = 'ALM Mode'; + +$lang->block->customModeTip = new stdClass(); +$lang->block->customModeTip->common = 'ZenTao Road operation mode is divided into [Light mode] and [ALM mode].'; +$lang->block->customModeTip->ALM = 'The concept is more complete and rigorous, and the function is more abundant. It is suitable for medium and large R&D teams.'; +$lang->block->customModeTip->light = 'Provides the core function of project management, suitable for small R&D teams.'; diff --git a/module/block/lang/en.php b/module/block/lang/en.php index a1ea970f15..77295236fd 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -622,3 +622,11 @@ $lang->block->themes['pink'] = 'Pink'; $lang->block->themes['blackberry'] = 'Blackberry'; $lang->block->themes['classic'] = 'Classic'; $lang->block->themes['purple'] = 'Purple'; + +$lang->block->customModes['light'] = 'Light Mode'; +$lang->block->customModes['ALM'] = 'ALM Mode'; + +$lang->block->customModeTip = new stdClass(); +$lang->block->customModeTip->common = 'ZenTao Road operation mode is divided into [Light mode] and [ALM mode].'; +$lang->block->customModeTip->ALM = 'The concept is more complete and rigorous, and the function is more abundant. It is suitable for medium and large R&D teams.'; +$lang->block->customModeTip->light = 'Provides the core function of project management, suitable for small R&D teams.'; diff --git a/module/block/lang/fr.php b/module/block/lang/fr.php index 3703522621..7ce1956f99 100644 --- a/module/block/lang/fr.php +++ b/module/block/lang/fr.php @@ -622,3 +622,11 @@ $lang->block->themes['pink'] = 'Pink'; $lang->block->themes['blackberry'] = 'Blackberry'; $lang->block->themes['classic'] = 'Classic'; $lang->block->themes['purple'] = 'Purple'; + +$lang->block->customModes['light'] = 'Light Mode'; +$lang->block->customModes['ALM'] = 'ALM Mode'; + +$lang->block->customModeTip = new stdClass(); +$lang->block->customModeTip->common = 'ZenTao Road operation mode is divided into [Light mode] and [ALM mode].'; +$lang->block->customModeTip->ALM = 'The concept is more complete and rigorous, and the function is more abundant. It is suitable for medium and large R&D teams.'; +$lang->block->customModeTip->light = 'Provides the core function of project management, suitable for small R&D teams.'; diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index e57cd01991..866ee594c3 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -622,3 +622,11 @@ $lang->block->themes['pink'] = '芙蕖粉'; $lang->block->themes['blackberry'] = '露莓黑'; $lang->block->themes['classic'] = '经典蓝'; $lang->block->themes['purple'] = '玉烟紫'; + +$lang->block->customModes['light'] = '轻量管理模式'; +$lang->block->customModes['ALM'] = '全生命周期管理模式'; + +$lang->block->customModeTip = new stdClass(); +$lang->block->customModeTip->common = '禅道运行模式分为【轻量级管理模式】和【全生命周期管理模式】。'; +$lang->block->customModeTip->ALM = '适用于中大型团队的管理模式，概念更加完整、严谨，功能更丰富。'; +$lang->block->customModeTip->light = '适用于小型研发团队的管理模式，提供项目管理的核心功能。'; diff --git a/module/block/view/guide.html.php b/module/block/view/guide.html.php index d7f9fcbce7..f4eb43fc1b 100644 --- a/module/block/view/guide.html.php +++ b/module/block/view/guide.html.php @@ -15,6 +15,11 @@ .block-guide .nav-secondary > li > a > span.btn-view {position: absolute; top: 0; right: 0; bottom: 0; padding: 8px; width: 36px; text-align: center; opacity: 0;} .block-guide .nav-secondary > li:hover > a > span.btn-view {opacity: 1;} .block-guide .nav-secondary > li.switch-icon {display: none;} +.block-guide .tab-pane .mode-switch .dataTitle {padding: 14px 20px;} +.block-guide .tab-pane .mode-switch .mode-block {background: #E6F0FF; margin-left: 10px; cursor: pointer;} +.block-guide .tab-pane .mode-switch .mode-block:nth-child(2) {margin-left: 5%;} +.block-guide .tab-pane .mode-switch .mode-block.active {border: 2px solid #2E7FFF;} +.block-guide .tab-pane .mode-switch .mode-desc {padding: 10px;} .block-guide .tab-pane .app-client .menu, .block-guide .tab-pane .app-client .tree-menu li {padding-left: 0;} .block-guide .tab-pane .app-client .tree-menu li {line-height: 56px; border-bottom: 1px solid #EDEEF2;} @@ -32,6 +37,8 @@ From 29a884e9d77413201739bad98c8912d81a3ed68f Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Tue, 20 Dec 2022 09:17:46 +0800 Subject: [PATCH 11/14] * Modify font size. --- module/block/view/guide.html.php | 1 + 1 file changed, 1 insertion(+) diff --git a/module/block/view/guide.html.php b/module/block/view/guide.html.php index 2dd3b4a701..b0af2af35f 100644 --- a/module/block/view/guide.html.php +++ b/module/block/view/guide.html.php @@ -15,6 +15,7 @@ .block-guide .nav-secondary > li > a > span.btn-view {position: absolute; top: 0; right: 0; bottom: 0; padding: 8px; width: 36px; text-align: center; opacity: 0;} .block-guide .nav-secondary > li:hover > a > span.btn-view {opacity: 1;} .block-guide .nav-secondary > li.switch-icon {display: none;} +.block-guide .tab-pane .dataTitle {font-size: 12px; color: #5E626D;} .block-guide .tab-pane .app-client .menu, .block-guide .tab-pane .app-client .tree-menu li {padding-left: 0;} .block-guide .tab-pane .app-client .tree-menu li {line-height: 56px; border-bottom: 1px solid #EDEEF2;} From c093724f9d4b859eb815246739f4ff7af7deed0c Mon Sep 17 00:00:00 2001 From: wangyidong Date: Mon, 19 Dec 2022 10:35:02 +0800 Subject: [PATCH 12/14] * fix bug #80463. --- module/product/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/product/model.php b/module/product/model.php index 1ae9044709..1e5072e1a9 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -1314,7 +1314,7 @@ class productModel extends model ->fetchAll('id'); /* Determine how to display the name of the program. */ - $programList = $this->loadModel('program')->getParentPairs('', 'noclosed'); + $programList = $this->loadModel('program')->getParentPairs('', ''); foreach($projectList as $id => $project) { $projectList[$id]->programName = $project->parent ? zget($programList, $project->parent, '') : ''; From d28ea77f0d9fc4d3766b08bdc49192d8d35a633f Mon Sep 17 00:00:00 2001 From: wangyidong Date: Mon, 19 Dec 2022 14:50:11 +0800 Subject: [PATCH 13/14] * code for task #80461. --- module/my/model.php | 2 +- module/task/model.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/my/model.php b/module/my/model.php index 38b1fd9612..bb6ae26b4b 100644 --- a/module/my/model.php +++ b/module/my/model.php @@ -344,7 +344,7 @@ class myModel extends model ->andWhere('t2.deleted')->eq(0) ->andWhere('t1.id')->in(array_keys($objectIDList)) ->orderBy($orderBy) - ->page($pager) + ->page($pager, 't1.id') ->fetchAll('id'); } elseif($objectType == 'requirement' or $objectType == 'story' or $objectType == 'bug') diff --git a/module/task/model.php b/module/task/model.php index 21044959c4..29c8185f55 100755 --- a/module/task/model.php +++ b/module/task/model.php @@ -2635,7 +2635,7 @@ class taskModel extends model ->beginIF($type == 'assignedTo' and $this->app->rawModule == 'my' and $this->app->rawMethod == 'work')->andWhere('t1.status')->notin('closed,cancel,pause')->fi() ->orderBy($orderBy) ->beginIF($limit > 0)->limit($limit)->fi() - ->page($pager) + ->page($pager, 't1.id') ->fetchAll('id'); $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'task', false); From 7859132611cf6f91fbdcc2d43fa5ae8ebdca089c Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Tue, 20 Dec 2022 09:26:42 +0800 Subject: [PATCH 14/14] * Modify font color. --- module/block/view/guide.html.php | 1 + 1 file changed, 1 insertion(+) diff --git a/module/block/view/guide.html.php b/module/block/view/guide.html.php index b0af2af35f..f6f69c171c 100644 --- a/module/block/view/guide.html.php +++ b/module/block/view/guide.html.php @@ -15,6 +15,7 @@ .block-guide .nav-secondary > li > a > span.btn-view {position: absolute; top: 0; right: 0; bottom: 0; padding: 8px; width: 36px; text-align: center; opacity: 0;} .block-guide .nav-secondary > li:hover > a > span.btn-view {opacity: 1;} .block-guide .nav-secondary > li.switch-icon {display: none;} +.block-guide .tab-pane h4 {color: #0B0F18;} .block-guide .tab-pane .dataTitle {font-size: 12px; color: #5E626D;} .block-guide .tab-pane .app-client .menu, .block-guide .tab-pane .app-client .tree-menu li {padding-left: 0;}