From aa6f7b5d5f07c57b6be50baf0b9b8caac2ec171e Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Wed, 26 Aug 2020 10:11:20 +0800 Subject: [PATCH] * Finish task#7654. --- module/block/control.php | 21 ++++++--- module/block/js/dashboard.js | 18 ++++++++ module/block/lang/zh-cn.php | 1 - module/block/view/scrumroadmapblock.html.php | 47 ++++++++++++++++++-- 4 files changed, 76 insertions(+), 11 deletions(-) diff --git a/module/block/control.php b/module/block/control.php index cd53a66a89..28ff4fabe3 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -1611,20 +1611,29 @@ class block extends control /** * Print srcum road map block. * + * @param int $productID * @access public * @return void */ - public function printScrumroadmapBlock() + public function printScrumroadmapBlock($productID = 0) { $this->session->set('releaseList', $this->app->getURI(true)); $this->session->set('productPlanList', $this->app->getURI(true)); - $products = $this->loadModel('product')->getPairs(); -ksort($products); -$productID = key($products); - $this->view->roadmaps = $this->product->getRoadmap($productID, 0, 6); + $products = $this->loadModel('product')->getPairs(); + if(!is_numeric($productID)) $productID = key($products); + + $this->view->roadmaps = $this->product->getRoadmap($productID, 0, 6); + $this->view->productID = $productID; - $this->view->products = $products; + $this->view->products = $products; + $this->view->sync = 1; + + if($_POST) + { + $this->view->sync = 0; + $this->display('block', 'scrumroadmapblock'); + } } /** diff --git a/module/block/js/dashboard.js b/module/block/js/dashboard.js index 4be23863ba..f1f8c11f22 100644 --- a/module/block/js/dashboard.js +++ b/module/block/js/dashboard.js @@ -248,3 +248,21 @@ $(function() refreshBlock($(this).closest('.panel')); }); }); + +function reloadRoadmap(productID) +{ + $.ajax( + { + url: createLink('block', 'printScrumroadmapBlock', 'id=' + productID), + dataType: "html", + async: false, + data: {id: productID}, + type: 'post', + success: function(data) + { + $("#roadMap").html(''); + $("#roadMap").html(data); + $("#createPlanLink").attr('href',createLink('productplan', 'create', 'id=' + productID) ); + } + }) +} diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index 0cfdd89c52..e8ec172284 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -334,7 +334,6 @@ $lang->block->modules['scrum']['index']->availableBlocks->scrumlist = $lang- $lang->block->modules['scrum']['index']->availableBlocks->scrumproject = $lang->projectCommon . '总览'; $lang->block->modules['scrum']['index']->availableBlocks->scrumproduct = $lang->productCommon . '总览'; $lang->block->modules['scrum']['index']->availableBlocks->scrumtest = '待测版本'; -$lang->block->modules['scrum']['index']->availableBlocks->scrumroadmap = $lang->productCommon . '路线图'; $lang->block->modules['cmmi']['index'] = new stdclass(); $lang->block->modules['cmmi']['index']->availableBlocks = new stdclass(); diff --git a/module/block/view/scrumroadmapblock.html.php b/module/block/view/scrumroadmapblock.html.php index 98147b6d19..52c6eccab3 100644 --- a/module/block/view/scrumroadmapblock.html.php +++ b/module/block/view/scrumroadmapblock.html.php @@ -10,19 +10,23 @@ * @link http://www.zentao.net */ ?> +
-
-
createLink('productplan', 'create', 'productID=' . $productID), ''. $lang->productplan->create, '', 'class="btn btn-mini" id="createPlan"');?>
+
+
createLink('productplan', 'create', 'productID=' . $productID), ''. $lang->productplan->create, '', 'class="btn btn-mini" id="createPlanLink"');?>
-
+
+ +
block->emptyTip;?>
+
    $mapBranches):?> @@ -51,4 +55,39 @@
+
+ + +
block->emptyTip;?>
+ +
+ +
+ +