Merge branch '281_bug#31524' into 'zentaopms_281'

* Fix bug #31524.

See merge request easycorp/zentaopms!6756

module/productplan/js/view.js

@@ -69,6 +69,13 @@ $(function()
 
             infoShowed = true;
         }
+        if(href !== '')
+        {
+            type = href == '#stories' ? 'story' : (href == '#bugs' ? 'bug' : 'planInfo');
+            var viewLink = createLink('productplan', 'view', 'planID=' + planID + '&type=' + type  + (typeof(param) == 'undefined' ? '' : param) + (typeof(orderBy) == 'undefined' ? '' : "&orderBy=" + orderBy));
+            if(type == 'planInfo') viewLink = createLink('productplan', 'view', 'planID=' + planID + '&type=' + type);
+            self.location.href = viewLink;
+        }
     });
 
     $('#storyList').on('sort.sortable', function(e, data)

module/productplan/view/view.html.php

@@ -66,7 +66,7 @@
             <?php endif;?>
           </a>
         </li>
-        <li>
+        <li class='<?php if($type == 'planInfo') echo 'active'?>'>
           <a href='#planInfo' data-toggle='tab'><?php echo  html::icon($lang->icons['plan'], 'text-info') . ' ' . $lang->productplan->view;?></a>
         </li>
     </ul>
@@ -533,7 +533,7 @@
           <?php endif;?>
         </form>
       </div>
-      <div id='planInfo' class='tab-pane'>
+      <div id='planInfo' class='tab-pane <?php if($type == 'planInfo') echo 'active';?>'>
         <div class='cell'>
           <div class='detail'>
             <div class='detail-title'><?php echo $lang->productplan->basicInfo;?></div>

module/release/js/view.js

@@ -10,9 +10,9 @@ function showLink(releaseID, type, param)
 
 /**
  * Load URL.
- * 
- * @param  string $url 
- * @param  string$type 
+ *
+ * @param  string $url
+ * @param  string$type
  * @access public
  * @return void
  */
@@ -68,5 +68,26 @@ $(function()
 
             infoShowed = true;
         }
+        if(href !== '')
+        {
+            switch(href)
+            {
+                case '#stories':
+                  type = 'story';
+                  break;
+                case '#bugs':
+                  type = 'bug';
+                  break;
+                case '#leftBugs':
+                  type = 'leftBug';
+                  break;
+                case '#releaseInfo':
+                  type = 'releaseInfo';
+                  break;
+            }
+            var viewLink = createLink('release', 'view', 'releaseID=' + releaseID + '&type=' + type  + '&link=' + link  + (typeof(param) == 'undefined' ? '' : param) + (typeof(orderBy) == 'undefined' ? '' : "&orderBy=" + orderBy));
+            if(type == 'releaseInfo') viewLink = createLink('release', 'view', 'releaseID=' + releaseID + '&type=' + type);
+            self.location.href = viewLink;
+        }
     });
 })