From 11d08e8620a84f508fb83e0dfe677fb45948b2ce Mon Sep 17 00:00:00 2001 From: liuruogu Date: Mon, 19 Sep 2022 01:43:12 +0000 Subject: [PATCH] * Finish task #69103. --- module/product/js/browse.js | 2 +- module/product/view/browse.html.php | 1 + module/project/model.php | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/module/product/js/browse.js b/module/product/js/browse.js index afe5bfdc07..a5934780c5 100644 --- a/module/product/js/browse.js +++ b/module/product/js/browse.js @@ -5,7 +5,7 @@ $(function() $('#navbar .nav li').removeClass('active'); $("#navbar .nav li[data-id=" + storyType + ']').addClass('active'); - if(rawModule == 'projectstory' && !projectHasProduct) + if(rawModule == 'projectstory' && !projectHasProduct && URAndSR) { $('#navbar .nav>li[data-id=story]').addClass('active'); $('#navbar .nav>li[data-id=story]>a').html($('.active [data-id=' + storyType + ']').text() + ''); diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index d1a7ce64ed..ce60d418f3 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -26,6 +26,7 @@ body {margin-bottom: 25px;} app->rawModule);?> app->tab == 'product' ? $product->type : '');?> hasProduct));?> +config->URAndSR);?> product->browse->unfoldStories) ? json_decode($config->product->browse->unfoldStories, true) : array(); $unfoldStories = zget($unfoldStories, $productID, array()); diff --git a/module/project/model.php b/module/project/model.php index ba228cfdbc..a22691e9a4 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -2452,7 +2452,7 @@ class projectModel extends model $lang->project->dividerMenu = $lang->{$model}->dividerMenu; } - if(empty($project->hasProduct)) + if(empty($project->hasProduct) && !empty($this->config->URAndSR)) { $projectProduct = $this->dao->select('product')->from(TABLE_PROJECTPRODUCT)->where('project')->eq($objectID)->fetch()->product; $lang->project->menu->settings['subMenu']->module['link'] = sprintf($lang->project->menu->settings['subMenu']->module['link'], $projectProduct);