-

lang->project->burn;?>

+

lang->project->burn . '(' . zget($lang->project->burnByList, $burnBy) . ')';?>

-
project->workHour})";?>
+
project->storyPoint})" : "({$lang->project->workHour})";?>
project->charts->burn->graph->reference;?>
project->charts->burn->graph->actuality;?>
@@ -50,6 +53,13 @@
diff --git a/module/milestone/view/index.html.php b/module/milestone/view/index.html.php index 3b1d4b87ab..b2fd81d9a7 100644 --- a/module/milestone/view/index.html.php +++ b/module/milestone/view/index.html.php @@ -11,7 +11,7 @@ table .btn.addItem, table .btn.delItem{padding: 3px 8px; font-size: 12px; line-h
- +
From 74bfa6834627199dc43607242ca499181df42dc8 Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Tue, 25 Aug 2020 08:13:31 +0800 Subject: [PATCH 15/18] * Adjust block lang. --- module/block/lang/zh-cn.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index 60bac9ec88..d59b2d4c88 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -474,7 +474,7 @@ $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->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|'; From 7f4c8ac9ac10a65bd806e8f1b87eaf2b251c163b Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Tue, 25 Aug 2020 08:19:53 +0800 Subject: [PATCH 16/18] * Finish task #7628. --- module/design/view/browse.html.php | 1 + 1 file changed, 1 insertion(+) diff --git a/module/design/view/browse.html.php b/module/design/view/browse.html.php index 3caa136bca..08c2796dc8 100644 --- a/module/design/view/browse.html.php +++ b/module/design/view/browse.html.php @@ -17,6 +17,7 @@ design->featureBar as $key => $label) { + if(empty($key)) continue; $active = $key == $type ? 'btn-active-text' : ''; $recTotalLabel = $key == $type ? " {$pager->recTotal}" : ''; echo html::a(inlink('browse', "productID={$productID}&type=$key"), "$label" . $recTotalLabel, '', "class='btn btn-link $active'"); From d62d93baa73ed6d0fc0e75f16f0690525edc496a Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Tue, 25 Aug 2020 08:57:39 +0800 Subject: [PATCH 17/18] * Finish task #7628. --- module/block/control.php | 7 +++++- module/block/view/programteamblock.html.php | 24 +++++++++++++++++++++ module/design/control.php | 7 ++++-- module/design/js/commit.js | 5 +++-- module/design/view/commit.html.php | 16 ++++++++++---- module/repo/view/revision.html.php | 2 +- 6 files changed, 51 insertions(+), 10 deletions(-) diff --git a/module/block/control.php b/module/block/control.php index b14d058819..13ad92372a 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -1450,7 +1450,12 @@ class block extends control public function printProgramteamBlock() { - + $this->loadModel('project'); + + $num = isset($this->params->num) ? (int)$this->params->num : 15; + + /* Get projects. */ + $this->view->programs = $this->loadModel('program')->getUserPrograms('all', 'id_desc', $num); } /** diff --git a/module/block/view/programteamblock.html.php b/module/block/view/programteamblock.html.php index e69de29bb2..3d863a5698 100644 --- a/module/block/view/programteamblock.html.php +++ b/module/block/view/programteamblock.html.php @@ -0,0 +1,24 @@ + +
block->emptyTip;?>
+ +
+ + + + + + + + + + + + + + + + + +
program->teamCount;?>task->consumed;?>
name;?>teamCount;?>consumed;?>
+
+ diff --git a/module/design/control.php b/module/design/control.php index 8b95ae0bd8..2dc9931925 100644 --- a/module/design/control.php +++ b/module/design/control.php @@ -220,7 +220,7 @@ class design extends control * @access public * @return void */ - public function commit($designID, $begin = '', $end = '', $recTotal = 0, $recPerPage = 50, $pageID = 1) + public function commit($designID, $repoID = 0, $begin = '', $end = '', $recTotal = 0, $recPerPage = 50, $pageID = 1) { $this->app->loadClass('pager', $static = true); $pager = new pager($recTotal, $recPerPage, $pageID); @@ -229,8 +229,10 @@ class design extends control $begin = $begin ? date('Y-m-d', strtotime($begin)) : $program->begin; $end = $end ? date('Y-m-d', strtotime($end)) : helper::today(); - $repoID = $this->session->repoID; + $repos = $this->loadModel('repo')->getRepoPairs(); + $repoID = $repoID ? $repoID : key($repos); $repo = $this->loadModel('repo')->getRepoByID($repoID); + $revisions = $this->repo->getCommits($repo, '', 'HEAD', '', $pager, $begin, $end); if($_POST) @@ -250,6 +252,7 @@ class design extends control $this->view->title = $this->lang->design->commit; $this->view->position[] = $this->lang->design->commit; + $this->view->repos = $repos; $this->view->repoID = $repoID; $this->view->repo = $repo; $this->view->revisions = $revisions; diff --git a/module/design/js/commit.js b/module/design/js/commit.js index 3d87736b51..53a1c9eb66 100644 --- a/module/design/js/commit.js +++ b/module/design/js/commit.js @@ -1,7 +1,8 @@ -$('#begin, #end').change(function() +$('#begin, #end, #repo').change(function() { var begin = $('#begin').val(); var end = $('#end').val(); + var repo = $('#repo').val(); if(begin.indexOf('-') != -1) { @@ -16,5 +17,5 @@ $('#begin, #end').change(function() for(i = 0 ; i < endarray.length ; i++) end = end + endarray[i]; } - location.href = createLink('design', 'commit', "designID=" + designID + '&begin=' + begin + '&end=' + end); + location.href = createLink('design', 'commit', "designID=" + designID + '&repoID=' + repo + '&begin=' + begin + '&end=' + end); }) diff --git a/module/design/view/commit.html.php b/module/design/view/commit.html.php index 1ee3f9c087..c194f9c363 100644 --- a/module/design/view/commit.html.php +++ b/module/design/view/commit.html.php @@ -20,10 +20,18 @@
-

design->commitDate . '：';?>

- - ~ - + + + + + + +

repo->maintain . ': ';?>

 +

design->commitDate . '：';?>

+ + ~ + +
method='post'> diff --git a/module/repo/view/revision.html.php b/module/repo/view/revision.html.php index f0080d1c7a..2482d0e98b 100644 --- a/module/repo/view/revision.html.php +++ b/module/repo/view/revision.html.php @@ -19,7 +19,7 @@ $typeInfo = $type == 'file' ? '&type=file' : '';