From 424653ac7fc618ec63f4c7e553eb6fb79ac98def Mon Sep 17 00:00:00 2001 From: liumengyi Date: Wed, 13 Jul 2022 11:23:50 +0800 Subject: [PATCH] * Fix bug #24896. --- module/caselib/model.php | 2 ++ module/testcase/js/view.js | 11 +++++++++++ module/testcase/view/view.html.php | 10 +--------- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/module/caselib/model.php b/module/caselib/model.php index 54b4a8bb71..977bc56463 100644 --- a/module/caselib/model.php +++ b/module/caselib/model.php @@ -28,6 +28,8 @@ class caselibModel extends model if(!empty($products) and $this->session->product) $this->loadModel('qa')->setMenu($products, $this->session->product); if(empty($products)) $this->loadModel('qa')->setMenu(array(0 => ''), 0); + $this->lang->qa->menu->caselib['subModule'] .= ',testcase'; + if($libraries) { $libName = ''; diff --git a/module/testcase/js/view.js b/module/testcase/js/view.js index f35a6c8bbc..1f96fb429d 100644 --- a/module/testcase/js/view.js +++ b/module/testcase/js/view.js @@ -1,5 +1,16 @@ $(document).ready(function() { + if(isLibCase) + { + $('#subNavbar [data-id=testcase]').removeClass('active'); + $('#navbar [data-id=testcase]').removeClass('active'); + } + else + { + $('#subNavbar [data-id=testcase]').addClass('active'); + $('#navbar [data-id=testcase]').addClass('active'); + } + if(config.onlybody != 'yes')$(".runCase").modalTrigger({width:'90%', type:'iframe', afterHide:function(){parent.location.href=parent.location.href;}}); if(config.onlybody != 'yes')$(".results").modalTrigger({width:'90%', type:'iframe'}); diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php index 0f8784eb45..0b45563774 100644 --- a/module/testcase/view/view.html.php +++ b/module/testcase/view/view.html.php @@ -366,14 +366,6 @@ fullscreen); js::set('retrack', $lang->retrack); +js::set('isLibCase', $isLibCase); ?> - - -