Merge branch 'sprint/175_liumengyi_17083' into 'master'

* Fix bug #17083.

See merge request easycorp/zentaopms!779

module/design/control.php

@@ -277,7 +277,7 @@ class design extends control
      */
     public function linkCommit($designID = 0, $repoID = 0, $begin = '', $end = '', $recTotal = 0, $recPerPage = 50, $pageID = 1)
     {
-        $design = $this->design->getById($designID);
+        $design    = $this->design->getById($designID);
         $productID = $this->commonAction($design->project, $design->product, $designID);
 
         /* Get project and date. */
@@ -330,9 +330,10 @@ class design extends control
         $this->view->designID   = $designID;
         $this->view->begin      = $begin;
         $this->view->end        = $end;
-        $this->view->design     = $this->design->getByID($designID);
+        $this->view->design     = $design;
         $this->view->pager      = $pager;
         $this->view->users      = $this->loadModel('user')->getPairs('noletter');
+        $this->view->type       = $design->type;
 
         $this->display();
     }

module/design/js/linkcommit.js

@@ -4,16 +4,16 @@ $('#begin, #end, #repo').change(function()
     var end     = $('#end').val();
     var repo    = $('#repo').val();
 
-    if(begin.indexOf('-') != -1) 
-    {   
+    if(begin.indexOf('-') != -1)
+    {
         var beginarray = begin.split("-");
-        var begin = ''; 
+        var begin = '';
         for(i = 0; i < beginarray.length; i++) begin = begin + beginarray[i];
-    }   
-    if(end.indexOf('-') != -1) 
-    {   
+    }
+    if(end.indexOf('-') != -1)
+    {
         var endarray = end.split("-");
-        var end = ''; 
+        var end = '';
         for(i = 0 ; i < endarray.length ; i++) end = end + endarray[i];
     }
 
@@ -26,3 +26,9 @@ $('#begin, #end, #repo').change(function()
 
     location.href = createLink('design', 'linkCommit', "designID=" + designID + '&repoID=' + repo + '&begin=' + begin + '&end=' + end);
 })
+
+$(function()
+{
+    $('#subNavbar .nav li').removeClass('active');
+    $('#subNavbar .nav li[data-id=' + type + ']').addClass('active');
+})

module/design/view/linkcommit.html.php

@@ -84,5 +84,6 @@
   <?php endif;?>
 </div>
 <?php js::set('designID', $designID);?>
+<?php js::set('type', strtolower($type));?>
 <?php js::set('errorDate', $lang->design->errorDate);?>
 <?php include '../../common/view/footer.html.php';?>