From 6207c0ef9f323e3ab45376edab9b272446ebb754 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Fri, 15 Dec 2023 17:31:40 +0800 Subject: [PATCH] * Adjust for module menu with drop menu. --- lib/zin/wg/navbar/v1.php | 1 + module/execution/ui/story.html.php | 6 ++++-- module/index/control.php | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/zin/wg/navbar/v1.php b/lib/zin/wg/navbar/v1.php index 43457674a7..e60a7e8e09 100644 --- a/lib/zin/wg/navbar/v1.php +++ b/lib/zin/wg/navbar/v1.php @@ -222,6 +222,7 @@ class navbar extends wg if($currentModule == strtolower($subModule) and $currentMethod == strtolower($subMethod)) { $activeMainMenu = true; + if($activeMenuID) $activeMainMenu = $dropMenuName == $activeMenuID; } else { diff --git a/module/execution/ui/story.html.php b/module/execution/ui/story.html.php index fc9a33317b..a434a3515b 100644 --- a/module/execution/ui/story.html.php +++ b/module/execution/ui/story.html.php @@ -11,6 +11,10 @@ declare(strict_types=1); namespace zin; +data('activeMenuID', $storyType); +jsVar('executionID', $execution->id); +jsVar('childrenAB', $lang->story->childrenAB); + /* Show feature bar. */ featureBar ( @@ -19,8 +23,6 @@ featureBar li(searchToggle(set::module('executionStory'), set::open($type == 'bysearch'))) ); -jsVar('executionID', $execution->id); -jsVar('childrenAB', $lang->story->childrenAB); $linkStoryByPlanTips = $multiBranch ? sprintf($lang->execution->linkBranchStoryByPlanTips, $lang->project->branch) : $lang->execution->linkNormalStoryByPlanTips; $linkStoryByPlanTips = $execution->multiple ? $linkStoryByPlanTips : str_replace($lang->execution->common, $lang->projectCommon, $linkStoryByPlanTips); modal diff --git a/module/index/control.php b/module/index/control.php index 522e30658a..cb223a0c6a 100644 --- a/module/index/control.php +++ b/module/index/control.php @@ -1,4 +1,5 @@