From f88cccac6516c595786717ce21ceb559e94c3979 Mon Sep 17 00:00:00 2001 From: hufangzhou <746775970@qq.com> Date: Tue, 1 Sep 2020 18:37:45 +0800 Subject: [PATCH] * Adjust block code. --- module/block/control.php | 14 ++++---- module/block/lang/en.php | 7 ++-- module/block/lang/zh-cn.php | 34 +++++++++---------- module/block/model.php | 24 ++++++++++--- ....html.php => programdynamicblock.html.php} | 0 ...k.html.php => scrumoverviewblock.html.php} | 0 module/issue/view/batchcreate.html.php | 2 +- 7 files changed, 48 insertions(+), 33 deletions(-) rename module/block/view/{scrumdynamicblock.html.php => programdynamicblock.html.php} (100%) rename module/block/view/{scrumoverallblock.html.php => scrumoverviewblock.html.php} (100%) diff --git a/module/block/control.php b/module/block/control.php index 313d850a6b..af747da79e 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -1253,7 +1253,7 @@ class block extends control * @access public * @return void */ - public function printScrumoverallBlock() + public function printScrumOverviewBlock() { $programID = $this->session->program; $totalData = $this->loadModel('program')->getProgramOverview('byId', $programID, 'id_desc', 15); @@ -1268,7 +1268,7 @@ class block extends control * @access public * @return void */ - public function printScrumlistBlock() + public function printScrumListBlock() { $this->app->loadClass('pager', $static = true); if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die(); @@ -1284,7 +1284,7 @@ class block extends control * @access public * @return void */ - public function printScrumproductBlock() + public function printScrumProductBlock() { $stories = array(); $bugs = array(); @@ -1334,12 +1334,12 @@ class block extends control } /** - * Print srcum dynamic block. + * Print program dynamic block. * * @access public * @return void */ - public function printScrumdynamicBlock() + public function printProgramDynamicBlock() { $projects = $this->loadModel('project')->getPairs(); $products = $this->loadModel('product')->getPairs(); @@ -1365,7 +1365,7 @@ class block extends control * @access public * @return void */ - public function printScrumroadmapBlock($productID = 0, $blockNavID = '') + public function printScrumRoadMapBlock($productID = 0, $blockNavID = '') { $this->session->set('releaseList', $this->app->getURI(true)); $this->session->set('productPlanList', $this->app->getURI(true)); @@ -1393,7 +1393,7 @@ class block extends control * @access public * @return void */ - public function printScrumtestBlock() + public function printScrumTestBlock() { $this->session->set('testtaskList', $this->app->getURI(true)); if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die(); diff --git a/module/block/lang/en.php b/module/block/lang/en.php index a9f988a5f3..39490db842 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -135,8 +135,8 @@ $lang->block->default['waterfall']['program']['7']['params']['type'] = 'all'; $lang->block->default['waterfall']['program']['7']['params']['count'] = '15'; $lang->block->default['waterfall']['program']['7']['params']['orderBy'] = 'id_desc'; -$lang->block->default['scrum']['program']['1']['title'] = $lang->projectCommon . ' Overall'; -$lang->block->default['scrum']['program']['1']['block'] = 'scrumoverall'; +$lang->block->default['scrum']['program']['1']['title'] = $lang->projectCommon . ' Overview'; +$lang->block->default['scrum']['program']['1']['block'] = 'scrumoverview'; $lang->block->default['scrum']['program']['1']['grid'] = 8; $lang->block->default['scrum']['program']['2']['title'] = $lang->projectCommon . ' List'; @@ -339,7 +339,7 @@ $lang->block->modules['program']->availableBlocks->statistic = $lang->projec $lang->block->modules['scrum']['index'] = new stdclass(); $lang->block->modules['scrum']['index']->availableBlocks = new stdclass(); -$lang->block->modules['scrum']['index']->availableBlocks->scrumoverall = $lang->projectCommon . ' Overall'; +$lang->block->modules['scrum']['index']->availableBlocks->scrumoverview = $lang->projectCommon . ' Overview'; $lang->block->modules['scrum']['index']->availableBlocks->scrumlist = $lang->projectCommon . ' List'; $lang->block->modules['scrum']['index']->availableBlocks->scrumroadmap = $lang->productCommon . ' Rode Map'; $lang->block->modules['scrum']['index']->availableBlocks->sprint = $lang->projectCommon . ' Overview'; @@ -487,7 +487,6 @@ $lang->block->modules['program']->moreLinkList->cmmiestimate = 'workestimation| $lang->block->modules['program']->moreLinkList->cmmiissue = 'issue|browse|'; $lang->block->modules['program']->moreLinkList->cmmirisk = 'risk|browse|'; $lang->block->modules['program']->moreLinkList->scrumlist = 'project|all|'; -$lang->block->modules['program']->moreLinkList->scrumroadmap = 'product|all|'; $lang->block->modules['program']->moreLinkList->scrumtest = 'testtask|browse|'; $lang->block->modules['program']->moreLinkList->scrumproduct = 'product|all|'; $lang->block->modules['program']->moreLinkList->sprint = 'project|all|'; diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index 37a261fa5b..8dd86e716e 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -122,7 +122,7 @@ $lang->block->default['waterfall']['program']['5']['params']['count'] = '15'; $lang->block->default['waterfall']['program']['5']['params']['orderBy'] = 'id_desc'; $lang->block->default['waterfall']['program']['6']['title'] = '最新动态'; -$lang->block->default['waterfall']['program']['6']['block'] = 'scrumdynamic'; +$lang->block->default['waterfall']['program']['6']['block'] = 'programdynamic'; $lang->block->default['waterfall']['program']['6']['grid'] = 4; $lang->block->default['waterfall']['program']['6']['source'] = 'program'; @@ -136,7 +136,7 @@ $lang->block->default['waterfall']['program']['7']['params']['count'] = '15'; $lang->block->default['waterfall']['program']['7']['params']['orderBy'] = 'id_desc'; $lang->block->default['scrum']['program']['1']['title'] = '项目整体情况'; -$lang->block->default['scrum']['program']['1']['block'] = 'scrumoverall'; +$lang->block->default['scrum']['program']['1']['block'] = 'scrumoverview'; $lang->block->default['scrum']['program']['1']['grid'] = 8; $lang->block->default['scrum']['program']['2']['title'] = $lang->projectCommon . '列表'; @@ -164,7 +164,7 @@ $lang->block->default['scrum']['program']['6']['block'] = 'sprint'; $lang->block->default['scrum']['program']['6']['grid'] = 4; $lang->block->default['scrum']['program']['7']['title'] = '最新动态'; -$lang->block->default['scrum']['program']['7']['block'] = 'scrumdynamic'; +$lang->block->default['scrum']['program']['7']['block'] = 'programdynamic'; $lang->block->default['scrum']['program']['7']['grid'] = 4; $lang->block->default['product']['1']['title'] = $lang->productCommon . '统计'; @@ -339,12 +339,13 @@ $lang->block->modules['program']->availableBlocks->statistic = '项目统计 $lang->block->modules['scrum']['index'] = new stdclass(); $lang->block->modules['scrum']['index']->availableBlocks = new stdclass(); -$lang->block->modules['scrum']['index']->availableBlocks->scrumoverall = '项目整体情况'; +$lang->block->modules['scrum']['index']->availableBlocks->scrumoverview = '项目整体情况'; $lang->block->modules['scrum']['index']->availableBlocks->scrumlist = $lang->projectCommon . '列表'; $lang->block->modules['scrum']['index']->availableBlocks->scrumroadmap = $lang->productCommon . '路线图'; $lang->block->modules['scrum']['index']->availableBlocks->sprint = $lang->projectCommon . '总览'; $lang->block->modules['scrum']['index']->availableBlocks->scrumproduct = $lang->productCommon . '总览'; $lang->block->modules['scrum']['index']->availableBlocks->scrumtest = '待测版本'; +$lang->block->modules['scrum']['index']->availableBlocks->programdynamic = '最新动态'; $lang->block->modules['waterfall']['index'] = new stdclass(); $lang->block->modules['waterfall']['index']->availableBlocks = new stdclass(); @@ -479,19 +480,18 @@ $lang->block->typeList->testtask['done'] = '已测版本'; $lang->block->typeList->testtask['all'] = '全部'; $lang->block->modules['program']->moreLinkList = new stdclass(); -$lang->block->modules['program']->moreLinkList->recentprogram = 'program|browse|'; -$lang->block->modules['program']->moreLinkList->statistic = 'program|browse|'; -$lang->block->modules['program']->moreLinkList->program = 'program|browse|'; -$lang->block->modules['program']->moreLinkList->cmmireport = 'weekly|index|'; -$lang->block->modules['program']->moreLinkList->cmmiestimate = 'workestimation|index|'; -$lang->block->modules['program']->moreLinkList->cmmiissue = 'issue|browse|'; -$lang->block->modules['program']->moreLinkList->cmmirisk = 'risk|browse|'; -$lang->block->modules['program']->moreLinkList->scrumlist = 'project|all|'; -$lang->block->modules['program']->moreLinkList->scrumroadmap = 'product|all|'; -$lang->block->modules['program']->moreLinkList->scrumtest = 'testtask|browse|'; -$lang->block->modules['program']->moreLinkList->scrumproduct = 'product|all|'; -$lang->block->modules['program']->moreLinkList->sprint = 'project|all|'; -$lang->block->modules['program']->moreLinkList->scrumdynamic = 'company|dynamic|'; +$lang->block->modules['program']->moreLinkList->recentprogram = 'program|browse|'; +$lang->block->modules['program']->moreLinkList->statistic = 'program|browse|'; +$lang->block->modules['program']->moreLinkList->program = 'program|browse|'; +$lang->block->modules['program']->moreLinkList->cmmireport = 'weekly|index|'; +$lang->block->modules['program']->moreLinkList->cmmiestimate = 'workestimation|index|'; +$lang->block->modules['program']->moreLinkList->cmmiissue = 'issue|browse|'; +$lang->block->modules['program']->moreLinkList->cmmirisk = 'risk|browse|'; +$lang->block->modules['program']->moreLinkList->scrumlist = 'project|all|'; +$lang->block->modules['program']->moreLinkList->scrumtest = 'testtask|browse|'; +$lang->block->modules['program']->moreLinkList->scrumproduct = 'product|all|'; +$lang->block->modules['program']->moreLinkList->sprint = 'project|all|'; +$lang->block->modules['program']->moreLinkList->programdynamic = 'company|dynamic|'; $lang->block->modules['product']->moreLinkList = new stdclass(); $lang->block->modules['product']->moreLinkList->list = 'product|all|product=&line=0&status=%s'; diff --git a/module/block/model.php b/module/block/model.php index 603799c2a7..ae6d3f98f1 100644 --- a/module/block/model.php +++ b/module/block/model.php @@ -824,7 +824,7 @@ class blockModel extends model * @access public * @return void */ - public function getScrumtestParams($module = '') + public function getScrumTestParams($module = '') { $params = new stdclass(); $params->type['name'] = $this->lang->block->type; @@ -866,7 +866,7 @@ class blockModel extends model * @access public * @return string */ - public function getScrumoverallParams($module = '') + public function getScrumOverviewParams($module = '') { $params->count['name'] = $this->lang->block->count; $params->count['control'] = 'input'; @@ -881,7 +881,7 @@ class blockModel extends model * @access public * @return string */ - public function getScrumroadmapParams($module = '') + public function getScrumRoadMapParams($module = '') { $params->count['name'] = $this->lang->block->count; $params->count['control'] = 'input'; @@ -896,7 +896,23 @@ class blockModel extends model * @access public * @return string */ - public function getScrumproductParams($module = '') + public function getScrumProductParams($module = '') + { + $params->num['name'] = $this->lang->block->num; + $params->num['control'] = 'input'; + + return json_encode($params); + } + + + /** + * Get program dynamic params. + * + * @param string $module + * @access public + * @return string + */ + public function getProgramDynamicParams($module = '') { $params->count['name'] = $this->lang->block->count; $params->count['control'] = 'input'; diff --git a/module/block/view/scrumdynamicblock.html.php b/module/block/view/programdynamicblock.html.php similarity index 100% rename from module/block/view/scrumdynamicblock.html.php rename to module/block/view/programdynamicblock.html.php diff --git a/module/block/view/scrumoverallblock.html.php b/module/block/view/scrumoverviewblock.html.php similarity index 100% rename from module/block/view/scrumoverallblock.html.php rename to module/block/view/scrumoverviewblock.html.php diff --git a/module/issue/view/batchcreate.html.php b/module/issue/view/batchcreate.html.php index 3a53d4ba73..8e04b654a9 100644 --- a/module/issue/view/batchcreate.html.php +++ b/module/issue/view/batchcreate.html.php @@ -1,6 +1,6 @@