From 5bce51622bbf718d2749740316e90174e0e58a06 Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Mon, 7 Sep 2020 15:35:54 +0800 Subject: [PATCH 01/11] * Adjust estimate unit settings. --- config/zentaopms.php | 36 +++++++++++------------ module/custom/view/estimate.html.php | 21 +++++-------- module/workestimation/view/index.html.php | 6 +++- 3 files changed, 31 insertions(+), 32 deletions(-) diff --git a/config/zentaopms.php b/config/zentaopms.php index c91d33a7d4..3d9c507e50 100644 --- a/config/zentaopms.php +++ b/config/zentaopms.php @@ -85,29 +85,29 @@ $config->storyCommonList['vi'][0] = 'Câu chuyện'; $config->storyCommonList['vi'][1] = 'Câu chuyện'; /* Story common list. */ -$config->hourPointCommonList['zh-cn'][0] = '工时'; -$config->hourPointCommonList['zh-cn'][1] = '故事点'; -$config->hourPointCommonList['zh-cn'][2] = '功能点'; +$config->hourPointCommonList['zh-cn'][0] = '故事点'; +$config->hourPointCommonList['zh-cn'][1] = '功能点'; +$config->hourPointCommonList['zh-cn'][2] = '代码行'; -$config->hourPointCommonList['zh-tw'][0] = '工时'; -$config->hourPointCommonList['zh-tw'][1] = '故事点'; -$config->hourPointCommonList['zh-tw'][2] = '功能点'; +$config->hourPointCommonList['zh-tw'][0] = '故事点'; +$config->hourPointCommonList['zh-tw'][1] = '功能点'; +$config->hourPointCommonList['zh-tw'][2] = '代碼行'; -$config->hourPointCommonList['en'][0] = 'hour'; -$config->hourPointCommonList['en'][1] = 'story point'; -$config->hourPointCommonList['en'][2] = 'function point'; +$config->hourPointCommonList['en'][0] = 'story point'; +$config->hourPointCommonList['en'][1] = 'function point'; +$config->hourPointCommonList['en'][2] = 'loc point'; -$config->hourPointCommonList['de'][0] = 'hour'; -$config->hourPointCommonList['de'][1] = 'story point'; -$config->hourPointCommonList['de'][2] = 'function point'; +$config->hourPointCommonList['de'][0] = 'story point'; +$config->hourPointCommonList['de'][1] = 'function point'; +$config->hourPointCommonList['de'][2] = 'loc point'; -$config->hourPointCommonList['fr'][0] = 'hour'; -$config->hourPointCommonList['fr'][1] = 'story point'; -$config->hourPointCommonList['fr'][2] = 'function point'; +$config->hourPointCommonList['fr'][0] = 'story point'; +$config->hourPointCommonList['fr'][1] = 'function point'; +$config->hourPointCommonList['fr'][2] = 'loc point'; -$config->hourPointCommonList['vi'][0] = 'giờ'; -$config->hourPointCommonList['vi'][1] = 'điểm'; -$config->hourPointCommonList['vi'][2] = 'function point'; +$config->hourPointCommonList['vi'][0] = 'điểm'; +$config->hourPointCommonList['vi'][1] = 'function point'; +$config->hourPointCommonList['vi'][2] = 'loc point'; /* Plan common list. */ $config->planCommonList['zh-cn'][0] = '计划'; diff --git a/module/custom/view/estimate.html.php b/module/custom/view/estimate.html.php index cba9a42443..27b1654642 100644 --- a/module/custom/view/estimate.html.php +++ b/module/custom/view/estimate.html.php @@ -28,14 +28,9 @@ $lang->custom->system[] = 'estimate'; custom->unitList['manhour'] . $lang->custom->unitList['loc']; - } - else - { - echo $lang->custom->unitList['efficiency'] . $lang->hourCommon; - } + if($unit == 0) echo $lang->custom->unitList['efficiency'] . $lang->custom->conceptOptions->hourPoint[0]; + if($unit == 1) echo $lang->custom->unitList['efficiency'] . $lang->custom->conceptOptions->hourPoint[1]; + if($unit == 2) echo $lang->custom->unitList['manhour'] . $lang->custom->unitList['loc']; ?> @@ -85,8 +80,8 @@ $lang->custom->system[] = 'estimate'; -custom->conceptOptions->hourPoint[1]);?> -custom->conceptOptions->hourPoint[2]);?> +custom->conceptOptions->hourPoint[0]);?> +custom->conceptOptions->hourPoint[1]);?> custom->unitList['loc']);?> custom->unitList['efficiency']);?> custom->unitList['manhour']);?> @@ -94,9 +89,9 @@ $lang->custom->system[] = 'estimate'; $('#estimateTab').addClass('btn-active-text'); $('input[name="hourPoint"]').change(function() { - if($(this).val() == 1) $('#efficiency + span').text(efficiency + storyPoint); - if($(this).val() == 2) $('#efficiency + span').text(efficiency + functionPoint); - if($(this).val() == 3) $('#efficiency + span').text(manhour + loc); + if($(this).val() == 0) $('#efficiency + span').text(efficiency + storyPoint); + if($(this).val() == 1) $('#efficiency + span').text(efficiency + functionPoint); + if($(this).val() == 2) $('#efficiency + span').text(manhour + loc); }) diff --git a/module/workestimation/view/index.html.php b/module/workestimation/view/index.html.php index bbd2fe84dd..b55e9ef9c3 100644 --- a/module/workestimation/view/index.html.php +++ b/module/workestimation/view/index.html.php @@ -38,7 +38,11 @@
- custom->unitList['manhour'] . $lang->custom->unitList['loc'] : $lang->custom->unitList['efficiency'] . $lang->hourCommon;?> + custom->unitList['efficiency'] . $lang->hourCommon; + if($hourPoint == 1) echo $lang->custom->unitList['efficiency'] . $lang->hourCommon; + if($hourPoint == 2) echo $lang->custom->unitList['manhour'] . $lang->custom->unitList['loc']; + ?>
From e839e2df007f95746c106360b7060a97e7bc08a0 Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Mon, 7 Sep 2020 15:59:57 +0800 Subject: [PATCH 02/11] * Finish task#7844. --- module/issue/control.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/module/issue/control.php b/module/issue/control.php index 4f1601f9bc..9770ad0a57 100644 --- a/module/issue/control.php +++ b/module/issue/control.php @@ -311,6 +311,8 @@ class issue extends control $this->loadModel('action')->create('issue', $issueID, 'Resolved', $comment); } + if($resolution == 'resolved') $this->loadModel('action')->create('issue', $issueID, 'Resolved'); + $this->dao->update(TABLE_ISSUE)->set('objectID')->eq($objectID)->where('id')->eq($issueID)->exec(); die(js::locate(inLink('browse'), 'parent')); } From 4c2fe91237fbca9e921014484ea46a444ab71b81 Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Mon, 7 Sep 2020 16:08:25 +0800 Subject: [PATCH 03/11] *Fix block module lang. --- module/block/lang/de.php | 1 - module/block/lang/fr.php | 1 - module/block/lang/vi.php | 1 - 3 files changed, 3 deletions(-) diff --git a/module/block/lang/de.php b/module/block/lang/de.php index 6f57c53b35..d49b8ebe3a 100644 --- a/module/block/lang/de.php +++ b/module/block/lang/de.php @@ -59,7 +59,6 @@ $lang->block->estimatedHours = 'Estimated Hours'; $lang->block->consumedHours = 'Consumed Hours'; $lang->block->time = 'No'; $lang->block->week = 'Week'; -$lang->block->month = 'Month'; $lang->block->selectProduct = 'Product selection'; $lang->block->params = new stdclass(); diff --git a/module/block/lang/fr.php b/module/block/lang/fr.php index 7195314dd2..365e9fa581 100644 --- a/module/block/lang/fr.php +++ b/module/block/lang/fr.php @@ -59,7 +59,6 @@ $lang->block->estimatedHours = 'Estimated Hours'; $lang->block->consumedHours = 'Consumed Hours'; $lang->block->time = 'No'; $lang->block->week = 'Week'; -$lang->block->month = 'Month'; $lang->block->selectProduct = 'Product selection'; $lang->block->params = new stdclass(); diff --git a/module/block/lang/vi.php b/module/block/lang/vi.php index 376f7d2c46..6192e97b88 100644 --- a/module/block/lang/vi.php +++ b/module/block/lang/vi.php @@ -59,7 +59,6 @@ $lang->block->estimatedHours = 'Estimated Hours'; $lang->block->consumedHours = 'Consumed Hours'; $lang->block->time = 'No'; $lang->block->week = 'Week'; -$lang->block->month = 'Month'; $lang->block->selectProduct = 'Product selection'; $lang->block->params = new stdclass(); From 034173196cde5dedf49f5f68affe33ab6da5b13d Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Mon, 7 Sep 2020 16:15:45 +0800 Subject: [PATCH 04/11] * Fix issue to story error. --- module/issue/model.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/issue/model.php b/module/issue/model.php index 99ffb682b1..2c3e7eb387 100644 --- a/module/issue/model.php +++ b/module/issue/model.php @@ -343,11 +343,11 @@ class issueModel extends model public function createStory() { $story = fixer::input('post') - ->remove('resolution,resolvedBy,resolvedDate') ->add('openedBy', $this->app->user->account) ->add('openedDate', helper::now()) - ->setIF($this->post->needNotReview, 'status', 'active') + ->setIF($this->post->needNotReview or $this->post->product > 0, 'status', 'active') ->stripTags('spec', $this->config->allowedTags) + ->remove('resolution,resolvedBy,resolvedDate,needNotReview') ->get(); $this->dao->insert(TABLE_STORY)->data($story, 'spec')->exec(); From 0ccd1fd1440e800738bb336c2656e099b415825b Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Mon, 7 Sep 2020 16:22:18 +0800 Subject: [PATCH 05/11] *Fix custom module lang. --- module/custom/lang/de.php | 21 ++++++++++++++++++--- module/custom/lang/en.php | 6 ++++++ module/custom/lang/fr.php | 21 ++++++++++++++++++--- module/custom/lang/vi.php | 21 ++++++++++++++++++--- 4 files changed, 60 insertions(+), 9 deletions(-) diff --git a/module/custom/lang/de.php b/module/custom/lang/de.php index c25684d762..7286d20489 100644 --- a/module/custom/lang/de.php +++ b/module/custom/lang/de.php @@ -19,8 +19,6 @@ $lang->custom->score = 'Score'; $lang->custom->timezone = 'Timezone'; $lang->custom->scoreReset = 'Reset Score'; $lang->custom->scoreTitle = 'Point Feature'; -$lang->custom->setscrum = 'Interval Hint'; -$lang->custom->setWaterfall = 'Switch Views'; $lang->custom->estimate = 'Estimated configuration'; $lang->custom->estimateConfig = 'Estimated configuration'; $lang->custom->estimateUnit = 'Estimating Unit'; @@ -32,9 +30,13 @@ $lang->custom->region = 'Interval'; $lang->custom->tips = 'Tips'; $lang->custom->setTips = 'Set Tips'; $lang->custom->isRange = 'Is Target Control'; -$lang->custom->configureScrum = 'Concept'; $lang->custom->URStory = "User requirements"; $lang->custom->SRStory = "Software requirements"; +$lang->custom->epic = "Epic"; +$lang->custom->scrumStory = "Story"; +$lang->custom->waterfallCommon = "Waterfall"; +$lang->custom->configureWaterfall = "Waterfall Configure"; +$lang->custom->configureScrum = "Scrum Configure"; $lang->custom->object['program'] = 'Program'; $lang->custom->program->fields['unitList'] = 'Unit List'; @@ -198,3 +200,16 @@ $lang->custom->conceptOptions->hourPoint = array(); $lang->custom->conceptOptions->hourPoint['0'] = 'Story Point'; $lang->custom->conceptOptions->hourPoint['1'] = 'Function Point'; $lang->custom->conceptOptions->hourPoint['2'] = 'Code Line'; + +$lang->custom->waterfall = new stdclass(); +$lang->custom->waterfall->URAndSR = 'Are requirements and stories concepts enabled?'; +$lang->custom->waterfall->URSRName = 'A conceptual definition of requirements and stories?'; + +$lang->custom->scrum = new stdclass(); +$lang->custom->scrum->URAndSR = 'Is it going to be epic?'; +$lang->custom->scrum->URSRName = 'A conceptual definition of requirements?'; + +$lang->custom->waterfallOptions = new stdclass(); +$lang->custom->waterfallOptions->URAndSR = array(); +$lang->custom->waterfallOptions->URAndSR[0] = 'No'; +$lang->custom->waterfallOptions->URAndSR[1] = 'Yes'; diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php index 8ed042d56e..dca7800e8a 100644 --- a/module/custom/lang/en.php +++ b/module/custom/lang/en.php @@ -32,6 +32,8 @@ $lang->custom->setTips = 'Set Tips'; $lang->custom->isRange = 'Is Target Control'; $lang->custom->URStory = "User requirements"; $lang->custom->SRStory = "Software requirements"; +$lang->custom->epic = "Epic"; +$lang->custom->scrumStory = "Story"; $lang->custom->waterfallCommon = "Waterfall"; $lang->custom->configureWaterfall = "Waterfall Configure"; $lang->custom->configureScrum = "Scrum Configure"; @@ -203,6 +205,10 @@ $lang->custom->waterfall = new stdclass(); $lang->custom->waterfall->URAndSR = 'Are requirements and stories concepts enabled?'; $lang->custom->waterfall->URSRName = 'A conceptual definition of requirements and stories?'; +$lang->custom->scrum = new stdclass(); +$lang->custom->scrum->URAndSR = 'Is it going to be epic?'; +$lang->custom->scrum->URSRName = 'A conceptual definition of requirements?'; + $lang->custom->waterfallOptions = new stdclass(); $lang->custom->waterfallOptions->URAndSR = array(); $lang->custom->waterfallOptions->URAndSR[0] = 'No'; diff --git a/module/custom/lang/fr.php b/module/custom/lang/fr.php index f5b1395194..83d6a2b489 100644 --- a/module/custom/lang/fr.php +++ b/module/custom/lang/fr.php @@ -19,8 +19,6 @@ $lang->custom->score = 'Point'; $lang->custom->timezone = 'Timezone'; $lang->custom->scoreReset = 'Réinit Points'; $lang->custom->scoreTitle = 'Fonctionnalité des Points'; -$lang->custom->setscrum = 'Interval Hint'; -$lang->custom->setWaterfall = 'Switch Views'; $lang->custom->estimate = 'Estimated configuration'; $lang->custom->estimateConfig = 'Estimated configuration'; $lang->custom->estimateUnit = 'Estimating Unit'; @@ -32,9 +30,13 @@ $lang->custom->region = 'Interval'; $lang->custom->tips = 'Tips'; $lang->custom->setTips = 'Set Tips'; $lang->custom->isRange = 'Is Target Control'; -$lang->custom->configureScrum = 'Concept'; $lang->custom->URStory = "User requirements"; $lang->custom->SRStory = "Software requirements"; +$lang->custom->epic = "Epic"; +$lang->custom->scrumStory = "Story"; +$lang->custom->waterfallCommon = "Waterfall"; +$lang->custom->configureWaterfall = "Waterfall Configure"; +$lang->custom->configureScrum = "Scrum Configure"; $lang->custom->object['program'] = 'Program'; $lang->custom->program->fields['unitList'] = 'Unit List'; @@ -198,3 +200,16 @@ $lang->custom->conceptOptions->hourPoint = array(); $lang->custom->conceptOptions->hourPoint['0'] = 'Points de Story'; $lang->custom->conceptOptions->hourPoint['1'] = 'Points de Fonction'; $lang->custom->conceptOptions->hourPoint['2'] = 'Code Line'; + +$lang->custom->waterfall = new stdclass(); +$lang->custom->waterfall->URAndSR = 'Are requirements and stories concepts enabled?'; +$lang->custom->waterfall->URSRName = 'A conceptual definition of requirements and stories?'; + +$lang->custom->scrum = new stdclass(); +$lang->custom->scrum->URAndSR = 'Is it going to be epic?'; +$lang->custom->scrum->URSRName = 'A conceptual definition of requirements?'; + +$lang->custom->waterfallOptions = new stdclass(); +$lang->custom->waterfallOptions->URAndSR = array(); +$lang->custom->waterfallOptions->URAndSR[0] = 'No'; +$lang->custom->waterfallOptions->URAndSR[1] = 'Yes'; diff --git a/module/custom/lang/vi.php b/module/custom/lang/vi.php index 8f0480a418..aef55948ed 100644 --- a/module/custom/lang/vi.php +++ b/module/custom/lang/vi.php @@ -19,8 +19,6 @@ $lang->custom->score = 'Điểm'; $lang->custom->timezone = 'Timezone'; $lang->custom->scoreReset = 'Thiết lập lại điểm'; $lang->custom->scoreTitle = 'Tính năng điểm'; -$lang->custom->setscrum = 'Interval Hint'; -$lang->custom->setWaterfall = 'Switch Views'; $lang->custom->estimate = 'Estimated configuration'; $lang->custom->estimateConfig = 'Estimated configuration'; $lang->custom->estimateUnit = 'Estimating Unit'; @@ -32,9 +30,13 @@ $lang->custom->region = 'Interval'; $lang->custom->tips = 'Tips'; $lang->custom->setTips = 'Set Tips'; $lang->custom->isRange = 'Is Target Control'; -$lang->custom->configureScrum = 'Concept'; $lang->custom->URStory = "User requirements"; $lang->custom->SRStory = "Software requirements"; +$lang->custom->epic = "Epic"; +$lang->custom->scrumStory = "Story"; +$lang->custom->waterfallCommon = "Waterfall"; +$lang->custom->configureWaterfall = "Waterfall Configure"; +$lang->custom->configureScrum = "Scrum Configure"; $lang->custom->object['program'] = 'Program'; $lang->custom->program->fields['unitList'] = 'Unit List'; @@ -198,3 +200,16 @@ $lang->custom->conceptOptions->hourPoint = array(); $lang->custom->conceptOptions->hourPoint['0'] = 'Điểm'; $lang->custom->conceptOptions->hourPoint['1'] = 'Function Point'; $lang->custom->conceptOptions->hourPoint['2'] = 'Code Line'; + +$lang->custom->waterfall = new stdclass(); +$lang->custom->waterfall->URAndSR = 'Are requirements and stories concepts enabled?'; +$lang->custom->waterfall->URSRName = 'A conceptual definition of requirements and stories?'; + +$lang->custom->scrum = new stdclass(); +$lang->custom->scrum->URAndSR = 'Is it going to be epic?'; +$lang->custom->scrum->URSRName = 'A conceptual definition of requirements?'; + +$lang->custom->waterfallOptions = new stdclass(); +$lang->custom->waterfallOptions->URAndSR = array(); +$lang->custom->waterfallOptions->URAndSR[0] = 'No'; +$lang->custom->waterfallOptions->URAndSR[1] = 'Yes'; From d8b1dc61cbe834675b7081682c021c55657e1994 Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Mon, 7 Sep 2020 16:25:12 +0800 Subject: [PATCH 06/11] *Fix programplan module lang. --- module/programplan/lang/en.php | 1 - 1 file changed, 1 deletion(-) diff --git a/module/programplan/lang/en.php b/module/programplan/lang/en.php index 79f6d47929..34d8770bd6 100644 --- a/module/programplan/lang/en.php +++ b/module/programplan/lang/en.php @@ -63,5 +63,4 @@ $lang->programplan->error = new stdclass(); $lang->programplan->error->percentNumber = '"Workload %" must be digits.'; $lang->programplan->error->planFinishSmall = 'The "End" date must be > the "Begin" date.'; $lang->programplan->error->percentOver = 'The sum of "Workload %" cannot exceed 100%.'; -$lang->programplan->error->onlyOneDev = 'Only one stage plan can be set for a first-level stage plan.'; $lang->programplan->error->createdTask = 'The task has been decomposed. Sub phases cannot be added.'; From 8ea64aa593b241c5e34654a1758437622c8b550b Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Mon, 7 Sep 2020 16:30:43 +0800 Subject: [PATCH 07/11] *Fix story module lang. --- module/story/lang/de.php | 3 +-- module/story/lang/en.php | 1 - module/story/lang/fr.php | 3 +-- module/story/lang/vi.php | 3 +-- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/module/story/lang/de.php b/module/story/lang/de.php index acc2b43fcb..e2cca57ca8 100644 --- a/module/story/lang/de.php +++ b/module/story/lang/de.php @@ -21,7 +21,6 @@ if(!empty($config->URAndSR)) $lang->story->createStory = 'Create ' . $lang->story->story; $lang->story->createRequirement = 'Create ' . $lang->story->requirement; $lang->story->affectedStories = "Affected {$lang->story->story}"; - $lang->storyCommon = 'Story'; } $lang->story->batchCreate = "Mehere hinzufügen"; @@ -139,7 +138,7 @@ $lang->story->allStories = 'Alle'; $lang->story->unclosed = 'Nicht geschlossen'; $lang->story->deleted = 'Gelöscht'; $lang->story->released = 'Released Linked Stories'; -$lang->story->storyChanged = 'Requirement Changed'; +$lang->story->URChanged = 'Requirement Changed'; $lang->story->design = 'Designs'; $lang->story->case = 'Cases'; $lang->story->bug = 'Bugs'; diff --git a/module/story/lang/en.php b/module/story/lang/en.php index dd490f0c83..61d50c95c3 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -21,7 +21,6 @@ if($config->URAndSR) $lang->story->createStory = 'Create ' . $lang->story->story; $lang->story->createRequirement = 'Create ' . $lang->story->requirement; $lang->story->affectedStories = "Affected {$lang->story->story}"; - $lang->storyCommon = 'Story'; } $lang->story->batchCreate = "Batch Create"; diff --git a/module/story/lang/fr.php b/module/story/lang/fr.php index d6462ab788..b527b53e19 100644 --- a/module/story/lang/fr.php +++ b/module/story/lang/fr.php @@ -21,7 +21,6 @@ if(!empty($config->URAndSR)) $lang->story->createStory = 'Create ' . $lang->story->story; $lang->story->createRequirement = 'Create ' . $lang->story->requirement; $lang->story->affectedStories = "Affected {$lang->story->story}"; - $lang->storyCommon = 'Story'; } $lang->story->batchCreate = "Créer par Lot"; @@ -139,7 +138,7 @@ $lang->story->allStories = 'Toutes les Stories'; $lang->story->unclosed = 'Non Fermées'; $lang->story->deleted = 'Supprimée'; $lang->story->released = 'Stories Versionnées'; -$lang->story->storyChanged = 'Requirement Changed'; +$lang->story->URChanged = 'Requirement Changed'; $lang->story->design = 'Designs'; $lang->story->case = 'Cases'; $lang->story->bug = 'Bugs'; diff --git a/module/story/lang/vi.php b/module/story/lang/vi.php index 5e4f25c3c4..3afb40c529 100644 --- a/module/story/lang/vi.php +++ b/module/story/lang/vi.php @@ -21,7 +21,6 @@ if(!empty($config->URAndSR)) $lang->story->createStory = 'Create ' . $lang->story->story; $lang->story->createRequirement = 'Create ' . $lang->story->requirement; $lang->story->affectedStories = "Affected {$lang->story->story}"; - $lang->storyCommon = 'Story'; } $lang->story->batchCreate = "Tạo hàng loạt"; @@ -139,7 +138,7 @@ $lang->story->allStories = 'Tất cả câu chuyện'; $lang->story->unclosed = 'Chưa đóng'; $lang->story->deleted = 'Đã xóa'; $lang->story->released = 'Đã phát hành'; -$lang->story->storyChanged = 'Requirement Changed'; +$lang->story->URChanged = 'Requirement Changed'; $lang->story->design = 'Designs'; $lang->story->case = 'Cases'; $lang->story->bug = 'Bugs'; From af483277dfe952090b0362eacc3397de0fb57dd5 Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Mon, 7 Sep 2020 16:34:17 +0800 Subject: [PATCH 08/11] * Repair transfer task get assignor. --- module/issue/view/taskform.html.php | 47 +++++++++++++++++++++++++---- 1 file changed, 41 insertions(+), 6 deletions(-) diff --git a/module/issue/view/taskform.html.php b/module/issue/view/taskform.html.php index 3bc610245d..3b65481c16 100644 --- a/module/issue/view/taskform.html.php +++ b/module/issue/view/taskform.html.php @@ -116,13 +116,48 @@ $hiddenDeadline = strpos(",$showFields,", ',deadline,') === false; From 9d90298343b2177598add636b82f5a5961a7c8fe Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Mon, 7 Sep 2020 16:47:16 +0800 Subject: [PATCH 09/11] * Adjust issue solving jump page. --- module/issue/control.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/module/issue/control.php b/module/issue/control.php index 9770ad0a57..f009392b9d 100644 --- a/module/issue/control.php +++ b/module/issue/control.php @@ -312,8 +312,9 @@ class issue extends control } if($resolution == 'resolved') $this->loadModel('action')->create('issue', $issueID, 'Resolved'); - $this->dao->update(TABLE_ISSUE)->set('objectID')->eq($objectID)->where('id')->eq($issueID)->exec(); + + if(isonlybody()) die(js::closeModal('parent.parent', 'this')); die(js::locate(inLink('browse'), 'parent')); } From 7327889f8b850b22e4ddc1ca54e62941647c7f05 Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Mon, 7 Sep 2020 16:55:52 +0800 Subject: [PATCH 10/11] *Add custom module lang. --- module/custom/lang/de.php | 2 ++ module/custom/lang/en.php | 2 ++ module/custom/lang/fr.php | 2 ++ module/custom/lang/vi.php | 2 ++ module/custom/lang/zh-cn.php | 2 ++ 5 files changed, 10 insertions(+) diff --git a/module/custom/lang/de.php b/module/custom/lang/de.php index 7286d20489..35d31ffdc7 100644 --- a/module/custom/lang/de.php +++ b/module/custom/lang/de.php @@ -19,6 +19,8 @@ $lang->custom->score = 'Score'; $lang->custom->timezone = 'Timezone'; $lang->custom->scoreReset = 'Reset Score'; $lang->custom->scoreTitle = 'Point Feature'; +$lang->custom->setscrum = 'Switch the scrum view'; +$lang->custom->setWaterfall = 'Switch the waterfall view'; $lang->custom->estimate = 'Estimated configuration'; $lang->custom->estimateConfig = 'Estimated configuration'; $lang->custom->estimateUnit = 'Estimating Unit'; diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php index dca7800e8a..94b056fe41 100644 --- a/module/custom/lang/en.php +++ b/module/custom/lang/en.php @@ -19,6 +19,8 @@ $lang->custom->score = 'Point'; $lang->custom->timezone = 'Timezone'; $lang->custom->scoreReset = 'Reset Points'; $lang->custom->scoreTitle = 'Point Feature'; +$lang->custom->setscrum = 'Switch the scrum view'; +$lang->custom->setWaterfall = 'Switch the waterfall view'; $lang->custom->estimate = 'Estimated configuration'; $lang->custom->estimateConfig = 'Estimated configuration'; $lang->custom->estimateUnit = 'Estimating Unit'; diff --git a/module/custom/lang/fr.php b/module/custom/lang/fr.php index 83d6a2b489..edd28f4a4f 100644 --- a/module/custom/lang/fr.php +++ b/module/custom/lang/fr.php @@ -19,6 +19,8 @@ $lang->custom->score = 'Point'; $lang->custom->timezone = 'Timezone'; $lang->custom->scoreReset = 'Réinit Points'; $lang->custom->scoreTitle = 'Fonctionnalité des Points'; +$lang->custom->setscrum = 'Switch the scrum view'; +$lang->custom->setWaterfall = 'Switch the waterfall view'; $lang->custom->estimate = 'Estimated configuration'; $lang->custom->estimateConfig = 'Estimated configuration'; $lang->custom->estimateUnit = 'Estimating Unit'; diff --git a/module/custom/lang/vi.php b/module/custom/lang/vi.php index aef55948ed..361deb8351 100644 --- a/module/custom/lang/vi.php +++ b/module/custom/lang/vi.php @@ -19,6 +19,8 @@ $lang->custom->score = 'Điểm'; $lang->custom->timezone = 'Timezone'; $lang->custom->scoreReset = 'Thiết lập lại điểm'; $lang->custom->scoreTitle = 'Tính năng điểm'; +$lang->custom->setscrum = 'Switch the scrum view'; +$lang->custom->setWaterfall = 'Switch the waterfall view'; $lang->custom->estimate = 'Estimated configuration'; $lang->custom->estimateConfig = 'Estimated configuration'; $lang->custom->estimateUnit = 'Estimating Unit'; diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php index 9357669526..706c38052b 100644 --- a/module/custom/lang/zh-cn.php +++ b/module/custom/lang/zh-cn.php @@ -19,6 +19,8 @@ $lang->custom->score = '积分'; $lang->custom->timezone = '时区'; $lang->custom->scoreReset = '重置积分'; $lang->custom->scoreTitle = '积分功能'; +$lang->custom->setscrum = '切换敏捷视图'; +$lang->custom->setWaterfall = '切换瀑布视图'; $lang->custom->estimate = '估算配置'; $lang->custom->estimateConfig = '估算配置'; $lang->custom->estimateUnit = '估算单位'; From 21bffe7e6975d5a04e206873ed3a57ff0c8aa786 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Mon, 7 Sep 2020 17:05:57 +0800 Subject: [PATCH 11/11] * Fix common en lang. --- module/common/lang/en.php | 4 ++-- module/custom/lang/en.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 16459ff48e..8ec2802eb8 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -151,9 +151,9 @@ if(isset($_COOKIE['systemModel']) and $_COOKIE['systemModel'] == 'scrum') $lang->system->menu = new stdclass(); $lang->system->menu->subject = array('link' => 'Subject|subject|browse|'); $lang->system->menu->holiday = array('link' => 'Holiday|holiday|browse|'); - $lang->system->menu->custom = array('link' => 'Custom|custom|concept|'); + $lang->system->menu->custom = array('link' => 'Custom|custom|configurescrum|'); - $lang->mainNav->system = ' System|subject|settips|'; + $lang->mainNav->system = ' System|subject|browse|'; unset($lang->system->dividerMenu); } diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php index 94b056fe41..c5fcb5d5ed 100644 --- a/module/custom/lang/en.php +++ b/module/custom/lang/en.php @@ -208,8 +208,8 @@ $lang->custom->waterfall->URAndSR = 'Are requirements and stories concepts enab $lang->custom->waterfall->URSRName = 'A conceptual definition of requirements and stories?'; $lang->custom->scrum = new stdclass(); -$lang->custom->scrum->URAndSR = 'Is it going to be epic?'; -$lang->custom->scrum->URSRName = 'A conceptual definition of requirements?'; +$lang->custom->scrum->URAndSR = 'Are epic concept enabled?'; +$lang->custom->scrum->URSRName = 'A conceptual definition of epic?'; $lang->custom->waterfallOptions = new stdclass(); $lang->custom->waterfallOptions->URAndSR = array();