* Fix bug#41568. Change nav to activeMenuID.

module/story/js/common.ui.js

@@ -1,24 +1,3 @@
-$(function()
-{
-    if(typeof(storyType) == 'undefined') storyType = '';
-    if(typeof(rawModule) == 'undefined') rawModule = 'product';
-    if(typeof(rawMethod) == 'undefined') rawMethod = '';
-    if(typeof(execution) != 'undefined') rawModule = 'projectstory';
-    if(typeof(isInModal) != 'undefined') isInModal = false;
-    app = $.cookie.get('tab');
-    if(['project', 'projectstory'].indexOf(rawModule) === -1 && app != 'qa' && rawMethod != 'batchtotask' && storyType && !isInModal)
-    {
-        let $storyNavbar    = $("#navbar .nav li a[data-id=" + storyType + ']');
-        let $storySubNavbar = $('#subNavbar li a[data-id="' + storyType + '"]')
-        if($storyNavbar.length > 0 || $storySubNavbar.length > 0)
-        {
-            $('#navbar .nav li a').removeClass('active');
-            $storyNavbar.addClass('active');
-            $storySubNavbar.addClass('active');
-        }
-    }
-});
-
 window.clickSubmit = function(e)
 {
     const status = $(e.submitter).data('status');

module/story/ui/batchedit.html.php

@@ -10,6 +10,7 @@ declare(strict_types=1);
  */
 namespace zin;
 
+data('activeMenuID', $storyType);
 jsVar('branchTagOption', $branchTagOption);
 jsVar('moduleList', $moduleList);
 jsVar('planGroups', $plans);

module/story/ui/change.html.php

@@ -11,6 +11,7 @@ declare(strict_types=1);
 namespace zin;
 include './affected.html.php';
 
+data('activeMenuID', $story->type);
 jsVar('lastReviewer', explode(',', $lastReviewer));
 jsVar('storyID', $story->id);
 jsVar('oldStoryTitle', $story->title);

module/story/ui/edit.html.php

@@ -34,6 +34,7 @@ if(!empty($story->stages) && isset($fields['stage']['options']))
     }
 }
 
+data('activeMenuID', $story->type);
 jsVar('storyType', $story->type);
 jsVar('storyID', $story->id);
 jsVar('storyStatus', $story->status);

module/story/ui/review.html.php

@@ -11,6 +11,7 @@ declare(strict_types=1);
 namespace zin;
 include './affected.html.php';
 
+data('activeMenuID', $story->type);
 jsVar('storyID', $story->id);
 jsVar('storyType', $story->type);
 jsVar('rawModule', $this->app->rawModule);

module/story/ui/view.html.php

@@ -13,11 +13,11 @@ namespace zin;
 $confirmDelete = $this->lang->story->confirmDelete;
 if($story->type == 'requirement') $confirmDelete = str_replace($lang->SRCommon, $lang->URCommon, $confirmDelete);
 
+data('activeMenuID', $story->type);
 jsVar('relievedTip', $lang->story->relievedTip);
 jsVar('unlinkStoryTip', $lang->story->unlinkStory);
 jsVar('confirmDeleteTip', $confirmDelete);
 jsVar('storyType', $story->type);
-jsVar('isInModal', isInModal());
 
 $isInModal  = isInModal();
 $otherParam = 'storyID=&projectID=';