From 0eb5658bb7b9dcb695a27c0151de631eeaf835b7 Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Mon, 7 Sep 2020 10:57:45 +0800
Subject: [PATCH] * Finish task#7815.

---
 module/block/control.php                     |  6 +++---
 module/block/js/dashboard.js                 | 10 +++++-----
 module/block/view/scrumroadmapblock.html.php | 14 +++++++-------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/module/block/control.php b/module/block/control.php
index 5e664057f1..655b17af20 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -1381,11 +1381,11 @@ class block extends control
      * Print srcum road map block.
      *
      * @param  int    $productID
-     * @param  int    $blockNavID
+     * @param  int    $roadMapID
      * @access public
      * @return void
      */
-    public function printScrumRoadMapBlock($productID = 0, $blockNavID = '')
+    public function printScrumRoadMapBlock($productID = 0, $roadMapID = 0)
     {
         $this->session->set('releaseList',     $this->app->getURI(true));
         $this->session->set('productPlanList', $this->app->getURI(true));
@@ -1396,9 +1396,9 @@ class block extends control
         $this->view->roadmaps  = $this->product->getRoadmap($productID, 0, 6);
 
         $this->view->productID  = $productID;
+        $this->view->roadMapID  = $roadMapID;
         $this->view->products   = $products;
         $this->view->sync       = 1;
-        $this->view->blockNavID = $blockNavID;
 
         if($_POST)
         {
diff --git a/module/block/js/dashboard.js b/module/block/js/dashboard.js
index 076da66adb..1d30046a47 100644
--- a/module/block/js/dashboard.js
+++ b/module/block/js/dashboard.js
@@ -251,19 +251,19 @@ $(function()
     });
 });
 
-function reloadRoadmap(productID, blockNavID)
+function reloadRoadmap(productID, roadMapID)
 {
     $.ajax(
     {
-        url: createLink('block', 'printScrumroadmapBlock', 'id=' + productID + '&blockNavID=' + blockNavID),
+        url: createLink('block', 'printScrumroadmapBlock', 'productID=' + productID + '&roadMapID=' + roadMapID),
         dataType: "html",
         async: false,
-        data: {id: productID, blockNavID: blockNavID},
+        data: {productID: productID, roadMapID: roadMapID},
         type: 'post',
         success: function(data)
         {
-            $("#roadMap" + blockNavID).html(data);
-            $("#" + blockNavID).chosen();
+            $("#roadMap" + roadMapID).html(data);
+            $("#" + roadMapID).chosen();
         }
     })
 }
diff --git a/module/block/view/scrumroadmapblock.html.php b/module/block/view/scrumroadmapblock.html.php
index b8f84f56d0..d85f159714 100644
--- a/module/block/view/scrumroadmapblock.html.php
+++ b/module/block/view/scrumroadmapblock.html.php
@@ -11,19 +11,19 @@
  */
 ?>
 <?php
-$blockNavID = empty($blockNavID) ? uniqid() : $blockNavID;
-echo $sync ? '<div id="roadMap' . $blockNavID . '">' : '';
+$roadMapID = isset($block->id) ? $block->id : $roadMapID;
+echo $sync ? '<div id="roadMap' . $roadMapID . '">' : '';
 ?>
 <style>
-.release-line>li:nth-child(even)>a{height: 92px;}
-.release-line>li:nth-child(odd){padding-top: 87px;}
+.release-line>li:nth-child(even)>a {height: 92px;}
+.release-line>li:nth-child(odd) {padding-top: 87px;}
 .release-line>li>a .title {overflow: hidden; width:150%; text-overflow: ellipsis;}
-#dashboard .panel-move-handler{right: 30px}
-#productList{width:32%; position: absolute; top: 6px; left: 96px;}
+#dashboard .panel-move-handler {right: 30px}
+#productList {width:32%; position: absolute; top: 6px; left: 96px;}
 </style>
 <div class="panel-move-handler">
   <div id="productList">
-  <?php if(!empty($products)) echo html::select('productID', $products, $productID, 'id="' . $blockNavID .'" class="form-control chosen" onchange="reloadRoadmap(this.options[this.options.selectedIndex].value, this.id)"');?>
+  <?php if(!empty($products)) echo html::select('productID', $products, $productID, 'id="' . $roadMapID .'" class="form-control chosen" onchange="reloadRoadmap(this.options[this.options.selectedIndex].value, this.id)"');?>
   </div>
 </div>
 <div class="panel-body conatiner-fluid">