From 1faf5459540be1d13de1aaab8e4ea140908d6a61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= Date: Thu, 2 Dec 2021 13:10:55 +0800 Subject: [PATCH] * Remove unused code. --- module/block/lang/de.php | 41 ++------------------------- module/block/lang/en.php | 9 ++---- module/block/lang/fr.php | 41 ++------------------------- module/block/lang/vi.php | 41 ++------------------------- module/block/lang/zh-cn.php | 5 ---- module/execution/control.php | 7 ----- module/execution/view/create.html.php | 2 +- 7 files changed, 9 insertions(+), 137 deletions(-) diff --git a/module/block/lang/de.php b/module/block/lang/de.php index 49b5678f4c..cc1e14e70b 100644 --- a/module/block/lang/de.php +++ b/module/block/lang/de.php @@ -103,48 +103,16 @@ $lang->block->spent = 'Has Been Spent'; $lang->block->budget = 'Budget'; $lang->block->left = 'Residuals'; -$lang->block->default['waterfall']['project']['1']['title'] = 'Project Weekly'; -$lang->block->default['waterfall']['project']['1']['block'] = 'waterfallreport'; -$lang->block->default['waterfall']['project']['1']['source'] = 'project'; -$lang->block->default['waterfall']['project']['1']['grid'] = 8; - -$lang->block->default['waterfall']['project']['2']['title'] = 'Estimate'; -$lang->block->default['waterfall']['project']['2']['block'] = 'waterfallestimate'; -$lang->block->default['waterfall']['project']['2']['source'] = 'project'; -$lang->block->default['waterfall']['project']['2']['grid'] = 4; - $lang->block->default['waterfall']['project']['3']['title'] = 'Plan Gantt Chart'; $lang->block->default['waterfall']['project']['3']['block'] = 'waterfallgantt'; $lang->block->default['waterfall']['project']['3']['source'] = 'project'; $lang->block->default['waterfall']['project']['3']['grid'] = 8; -$lang->block->default['waterfall']['project']['4']['title'] = 'Progress Chart'; -$lang->block->default['waterfall']['project']['4']['block'] = 'waterfallprogress'; -$lang->block->default['waterfall']['project']['4']['grid'] = 4; - -$lang->block->default['waterfall']['project']['5']['title'] = 'Project Issue'; -$lang->block->default['waterfall']['project']['5']['block'] = 'waterfallissue'; -$lang->block->default['waterfall']['project']['5']['source'] = 'project'; -$lang->block->default['waterfall']['project']['5']['grid'] = 8; - -$lang->block->default['waterfall']['project']['5']['params']['type'] = 'all'; -$lang->block->default['waterfall']['project']['5']['params']['count'] = '15'; -$lang->block->default['waterfall']['project']['5']['params']['orderBy'] = 'id_desc'; - $lang->block->default['waterfall']['project']['6']['title'] = 'Dynamic'; $lang->block->default['waterfall']['project']['6']['block'] = 'projectdynamic'; $lang->block->default['waterfall']['project']['6']['grid'] = 4; $lang->block->default['waterfall']['project']['6']['source'] = 'project'; -$lang->block->default['waterfall']['project']['7']['title'] = 'Project Risk'; -$lang->block->default['waterfall']['project']['7']['block'] = 'waterfallrisk'; -$lang->block->default['waterfall']['project']['7']['source'] = 'project'; -$lang->block->default['waterfall']['project']['7']['grid'] = 8; - -$lang->block->default['waterfall']['project']['7']['params']['type'] = 'all'; -$lang->block->default['waterfall']['project']['7']['params']['count'] = '15'; -$lang->block->default['waterfall']['project']['7']['params']['orderBy'] = 'id_desc'; - $lang->block->default['scrum']['project']['1']['title'] = 'Project Overall'; $lang->block->default['scrum']['project']['1']['block'] = 'scrumoverview'; $lang->block->default['scrum']['project']['1']['grid'] = 8; @@ -375,13 +343,8 @@ $lang->block->modules['scrum']['index']->availableBlocks->projectdynamic = 'Dyna $lang->block->modules['waterfall']['index'] = new stdclass(); $lang->block->modules['waterfall']['index']->availableBlocks = new stdclass(); -$lang->block->modules['waterfall']['index']->availableBlocks->waterfallreport = 'Project Weekly'; -$lang->block->modules['waterfall']['index']->availableBlocks->waterfallestimate = 'Estimate'; -$lang->block->modules['waterfall']['index']->availableBlocks->waterfallgantt = 'Plan Gantt Chart'; -$lang->block->modules['waterfall']['index']->availableBlocks->waterfallprogress = 'Progress Chart'; -$lang->block->modules['waterfall']['index']->availableBlocks->waterfallissue = 'Project Issue'; -$lang->block->modules['waterfall']['index']->availableBlocks->waterfallrisk = 'Project Risk'; -$lang->block->modules['waterfall']['index']->availableBlocks->projectdynamic = 'Dynamics'; +$lang->block->modules['waterfall']['index']->availableBlocks->waterfallgantt = 'Plan Gantt Chart'; +$lang->block->modules['waterfall']['index']->availableBlocks->projectdynamic = 'Dynamics'; $lang->block->modules['product'] = new stdclass(); $lang->block->modules['product']->availableBlocks = new stdclass(); diff --git a/module/block/lang/en.php b/module/block/lang/en.php index a39d9615cd..ce31de4f53 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -355,13 +355,8 @@ $lang->block->modules['scrum']['index']->availableBlocks->projectdynamic = 'Dyna $lang->block->modules['waterfall']['index'] = new stdclass(); $lang->block->modules['waterfall']['index']->availableBlocks = new stdclass(); -$lang->block->modules['waterfall']['index']->availableBlocks->waterfallreport = 'Project Weekly'; -$lang->block->modules['waterfall']['index']->availableBlocks->waterfallestimate = 'Estimate'; -$lang->block->modules['waterfall']['index']->availableBlocks->waterfallgantt = 'Plan Gantt Chart'; -$lang->block->modules['waterfall']['index']->availableBlocks->waterfallprogress = 'Progress Chart'; -$lang->block->modules['waterfall']['index']->availableBlocks->waterfallissue = 'Project Issue'; -$lang->block->modules['waterfall']['index']->availableBlocks->waterfallrisk = 'Project Risk'; -$lang->block->modules['waterfall']['index']->availableBlocks->projectdynamic = 'Dynamics'; +$lang->block->modules['waterfall']['index']->availableBlocks->waterfallgantt = 'Plan Gantt Chart'; +$lang->block->modules['waterfall']['index']->availableBlocks->projectdynamic = 'Dynamics'; $lang->block->modules['product'] = new stdclass(); $lang->block->modules['product']->availableBlocks = new stdclass(); diff --git a/module/block/lang/fr.php b/module/block/lang/fr.php index 1b47a8ce94..6c38c2f966 100644 --- a/module/block/lang/fr.php +++ b/module/block/lang/fr.php @@ -103,48 +103,16 @@ $lang->block->spent = 'Has Been Spent'; $lang->block->budget = 'Budget'; $lang->block->left = 'Residuals'; -$lang->block->default['waterfall']['project']['1']['title'] = 'Project Weekly'; -$lang->block->default['waterfall']['project']['1']['block'] = 'waterfallreport'; -$lang->block->default['waterfall']['project']['1']['source'] = 'project'; -$lang->block->default['waterfall']['project']['1']['grid'] = 8; - -$lang->block->default['waterfall']['project']['2']['title'] = 'Estimate'; -$lang->block->default['waterfall']['project']['2']['block'] = 'waterfallestimate'; -$lang->block->default['waterfall']['project']['2']['source'] = 'project'; -$lang->block->default['waterfall']['project']['2']['grid'] = 4; - $lang->block->default['waterfall']['project']['3']['title'] = 'Plan Gantt Chart'; $lang->block->default['waterfall']['project']['3']['block'] = 'waterfallgantt'; $lang->block->default['waterfall']['project']['3']['source'] = 'project'; $lang->block->default['waterfall']['project']['3']['grid'] = 8; -$lang->block->default['waterfall']['project']['4']['title'] = 'Progress Chart'; -$lang->block->default['waterfall']['project']['4']['block'] = 'waterfallprogress'; -$lang->block->default['waterfall']['project']['4']['grid'] = 4; - -$lang->block->default['waterfall']['project']['5']['title'] = 'project Issue'; -$lang->block->default['waterfall']['project']['5']['block'] = 'waterfallissue'; -$lang->block->default['waterfall']['project']['5']['source'] = 'project'; -$lang->block->default['waterfall']['project']['5']['grid'] = 8; - -$lang->block->default['waterfall']['project']['5']['params']['type'] = 'all'; -$lang->block->default['waterfall']['project']['5']['params']['count'] = '15'; -$lang->block->default['waterfall']['project']['5']['params']['orderBy'] = 'id_desc'; - $lang->block->default['waterfall']['project']['6']['title'] = 'Dynamic'; $lang->block->default['waterfall']['project']['6']['block'] = 'dynamic'; $lang->block->default['waterfall']['project']['6']['grid'] = 4; $lang->block->default['waterfall']['project']['6']['source'] = ''; -$lang->block->default['waterfall']['project']['7']['title'] = 'Project Risk'; -$lang->block->default['waterfall']['project']['7']['block'] = 'waterfallrisk'; -$lang->block->default['waterfall']['project']['7']['source'] = 'project'; -$lang->block->default['waterfall']['project']['7']['grid'] = 8; - -$lang->block->default['waterfall']['project']['7']['params']['type'] = 'all'; -$lang->block->default['waterfall']['project']['7']['params']['count'] = '15'; -$lang->block->default['waterfall']['project']['7']['params']['orderBy'] = 'id_desc'; - $lang->block->default['scrum']['project']['1']['title'] = 'Project Overall'; $lang->block->default['scrum']['project']['1']['block'] = 'scrumoverview'; $lang->block->default['scrum']['project']['1']['grid'] = 8; @@ -375,13 +343,8 @@ $lang->block->modules['scrum']['index']->availableBlocks->projectdynamic = 'Dyna $lang->block->modules['waterfall']['index'] = new stdclass(); $lang->block->modules['waterfall']['index']->availableBlocks = new stdclass(); -$lang->block->modules['waterfall']['index']->availableBlocks->waterfallreport = 'Project Weekly'; -$lang->block->modules['waterfall']['index']->availableBlocks->waterfallestimate = 'Estimate'; -$lang->block->modules['waterfall']['index']->availableBlocks->waterfallgantt = 'Plan Gantt Chart'; -$lang->block->modules['waterfall']['index']->availableBlocks->waterfallprogress = 'Progress Chart'; -$lang->block->modules['waterfall']['index']->availableBlocks->waterfallissue = 'Project Issue'; -$lang->block->modules['waterfall']['index']->availableBlocks->waterfallrisk = 'Project Risk'; -$lang->block->modules['waterfall']['index']->availableBlocks->projectdynamic = 'Dynamics'; +$lang->block->modules['waterfall']['index']->availableBlocks->waterfallgantt = 'Plan Gantt Chart'; +$lang->block->modules['waterfall']['index']->availableBlocks->projectdynamic = 'Dynamics'; $lang->block->modules['product'] = new stdclass(); $lang->block->modules['product']->availableBlocks = new stdclass(); diff --git a/module/block/lang/vi.php b/module/block/lang/vi.php index 37202953eb..f3ce3ab224 100644 --- a/module/block/lang/vi.php +++ b/module/block/lang/vi.php @@ -103,48 +103,16 @@ $lang->block->spent = 'Has Been Spent'; $lang->block->budget = 'Budget'; $lang->block->left = 'Residuals'; -$lang->block->default['waterfall']['project']['1']['title'] = 'Project Weekly'; -$lang->block->default['waterfall']['project']['1']['block'] = 'waterfallreport'; -$lang->block->default['waterfall']['project']['1']['source'] = 'project'; -$lang->block->default['waterfall']['project']['1']['grid'] = 8; - -$lang->block->default['waterfall']['project']['2']['title'] = 'Estimate'; -$lang->block->default['waterfall']['project']['2']['block'] = 'waterfallestimate'; -$lang->block->default['waterfall']['project']['2']['source'] = 'project'; -$lang->block->default['waterfall']['project']['2']['grid'] = 4; - $lang->block->default['waterfall']['project']['3']['title'] = 'Plan Gantt Chart'; $lang->block->default['waterfall']['project']['3']['block'] = 'waterfallgantt'; $lang->block->default['waterfall']['project']['3']['source'] = 'project'; $lang->block->default['waterfall']['project']['3']['grid'] = 8; -$lang->block->default['waterfall']['project']['4']['title'] = 'Progress Chart'; -$lang->block->default['waterfall']['project']['4']['block'] = 'waterfallprogress'; -$lang->block->default['waterfall']['project']['4']['grid'] = 4; - -$lang->block->default['waterfall']['project']['5']['title'] = 'Project Issue'; -$lang->block->default['waterfall']['project']['5']['block'] = 'waterfallissue'; -$lang->block->default['waterfall']['project']['5']['source'] = 'project'; -$lang->block->default['waterfall']['project']['5']['grid'] = 8; - -$lang->block->default['waterfall']['project']['5']['params']['type'] = 'all'; -$lang->block->default['waterfall']['project']['5']['params']['count'] = '15'; -$lang->block->default['waterfall']['project']['5']['params']['orderBy'] = 'id_desc'; - $lang->block->default['waterfall']['project']['6']['title'] = 'Dynamic'; $lang->block->default['waterfall']['project']['6']['block'] = 'dynamic'; $lang->block->default['waterfall']['project']['6']['grid'] = 4; $lang->block->default['waterfall']['project']['6']['source'] = 'project'; -$lang->block->default['waterfall']['project']['7']['title'] = 'Project Risk'; -$lang->block->default['waterfall']['project']['7']['block'] = 'waterfallrisk'; -$lang->block->default['waterfall']['project']['7']['source'] = 'project'; -$lang->block->default['waterfall']['project']['7']['grid'] = 8; - -$lang->block->default['waterfall']['project']['7']['params']['type'] = 'all'; -$lang->block->default['waterfall']['project']['7']['params']['count'] = '15'; -$lang->block->default['waterfall']['project']['7']['params']['orderBy'] = 'id_desc'; - $lang->block->default['scrum']['project']['1']['title'] = 'Project Overall'; $lang->block->default['scrum']['project']['1']['block'] = 'scrumoverview'; $lang->block->default['scrum']['project']['1']['grid'] = 8; @@ -375,13 +343,8 @@ $lang->block->modules['scrum']['index']->availableBlocks->projectdynamic = 'Dyna $lang->block->modules['waterfall']['index'] = new stdclass(); $lang->block->modules['waterfall']['index']->availableBlocks = new stdclass(); -$lang->block->modules['waterfall']['index']->availableBlocks->waterfallreport = $lang->executionCommon . ' Weekly'; -$lang->block->modules['waterfall']['index']->availableBlocks->waterfallestimate = 'Estimate'; -$lang->block->modules['waterfall']['index']->availableBlocks->waterfallgantt = 'Plan Gantt Chart'; -$lang->block->modules['waterfall']['index']->availableBlocks->waterfallprogress = 'Progress Chart'; -$lang->block->modules['waterfall']['index']->availableBlocks->waterfallissue = $lang->executionCommon . ' Issue'; -$lang->block->modules['waterfall']['index']->availableBlocks->waterfallrisk = $lang->executionCommon . ' Risk'; -$lang->block->modules['waterfall']['index']->availableBlocks->projectdynamic = 'Dynamics'; +$lang->block->modules['waterfall']['index']->availableBlocks->waterfallgantt = 'Plan Gantt Chart'; +$lang->block->modules['waterfall']['index']->availableBlocks->projectdynamic = 'Dynamics'; $lang->block->modules['product'] = new stdclass(); $lang->block->modules['product']->availableBlocks = new stdclass(); diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index 0d5f9392cb..ac77206f01 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -355,12 +355,7 @@ $lang->block->modules['scrum']['index']->availableBlocks->projectdynamic = '最 $lang->block->modules['waterfall']['index'] = new stdclass(); $lang->block->modules['waterfall']['index']->availableBlocks = new stdclass(); -$lang->block->modules['waterfall']['index']->availableBlocks->waterfallreport = '项目周报'; -$lang->block->modules['waterfall']['index']->availableBlocks->waterfallestimate = '估算'; $lang->block->modules['waterfall']['index']->availableBlocks->waterfallgantt = "项目计划"; -$lang->block->modules['waterfall']['index']->availableBlocks->waterfallprogress = '到目前为止项目进展趋势图'; -$lang->block->modules['waterfall']['index']->availableBlocks->waterfallissue = '项目问题'; -$lang->block->modules['waterfall']['index']->availableBlocks->waterfallrisk = '项目风险'; $lang->block->modules['waterfall']['index']->availableBlocks->projectdynamic = '最新动态'; $lang->block->modules['product'] = new stdclass(); diff --git a/module/execution/control.php b/module/execution/control.php index 8994afccf6..2077b548e1 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -1402,13 +1402,6 @@ class execution extends control } } - $isStage = false; - if(!empty($project->model) and $project->model == 'waterfall') - { - $isStage = true; - $this->lang->execution->type = str_replace($this->lang->executionCommon, $this->lang->project->stage, $this->lang->execution->type); - } - $this->loadModel('user'); $poUsers = $this->user->getPairs('noclosed|nodeleted|pofirst', '', $this->config->maxCount); if(!empty($this->config->user->moreLink)) $this->config->moreLinks["PM"] = $this->config->user->moreLink; diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php index 80f26d7161..a3785b1a47 100644 --- a/module/execution/view/create.html.php +++ b/module/execution/view/create.html.php @@ -36,7 +36,7 @@ execution->errorSameProducts);?> execution->errorSameBranches);?> - + systemMode);?> project->common);?>