From 83e14d45f13a1ea16071ea9bb9c02be177fbbae2 Mon Sep 17 00:00:00 2001 From: Hao Sun Date: Thu, 9 Sep 2021 16:50:36 +0800 Subject: [PATCH] * bug #15082, fix php error in tutorial mode. --- module/product/view/browse.html.php | 67 +++++++++++++++-------------- 1 file changed, 35 insertions(+), 32 deletions(-) diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index 6fcd53c302..381b4163db 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -81,44 +81,47 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : ''; app->rawModule, $this->app->rawMethod) as $menuItem) + if(!commonModel::isTutorialMode()) { - if(isset($menuItem->hidden)) continue; - if($menuItem->name == 'emptysr' && $storyType == 'story') continue; - $menuBrowseType = strpos($menuItem->name, 'QUERY') === 0 ? 'bySearch' : $menuItem->name; - if($menuItem->name == 'more') + foreach(customModel::getFeatureMenu($this->app->rawModule, $this->app->rawMethod) as $menuItem) { - if(!empty($lang->product->moreSelects)) + if(isset($menuItem->hidden)) continue; + if($menuItem->name == 'emptysr' && $storyType == 'story') continue; + $menuBrowseType = strpos($menuItem->name, 'QUERY') === 0 ? 'bySearch' : $menuItem->name; + if($menuItem->name == 'more') { - $moreLabel = $lang->more; - $moreLabelActive = ''; - $storyBrowseType = $this->session->storyBrowseType; - if(isset($lang->product->moreSelects[$storyBrowseType])) + if(!empty($lang->product->moreSelects)) { - $moreLabel = "{$lang->product->moreSelects[$storyBrowseType]} {$pager->recTotal}"; - $moreLabelActive = 'btn-active-text'; + $moreLabel = $lang->more; + $moreLabelActive = ''; + $storyBrowseType = $this->session->storyBrowseType; + if(isset($lang->product->moreSelects[$storyBrowseType])) + { + $moreLabel = "{$lang->product->moreSelects[$storyBrowseType]} {$pager->recTotal}"; + $moreLabelActive = 'btn-active-text'; + } + echo '
'; + echo html::a('javascript:;', $moreLabel . " ", '', "data-toggle='dropdown' class='btn btn-link $moreLabelActive'"); + echo "
'; } - echo '
'; - echo html::a('javascript:;', $moreLabel . " ", '', "data-toggle='dropdown' class='btn btn-link $moreLabelActive'"); - echo "
'; } - } - elseif($menuItem->name == 'QUERY') - { - $searchBrowseLink = $this->createLink($this->app->rawModule, $this->app->rawMethod, $projectIDParam . "productID=$productID&branch=$branch&browseType=$menuBrowseType¶m=%s&storyType=$storyType"); - $isBySearch = $this->session->storyBrowseType == 'bysearch'; - include '../../common/view/querymenu.html.php'; - } - else - { - $menuItemName = strtolower($menuItem->name); - echo html::a($this->createLink($this->app->rawModule, $this->app->rawMethod, $projectIDParam . "productID=$productID&branch=$branch&browseType=$menuBrowseType¶m=0&storyType=$storyType"), "$menuItem->text" . ($menuItemName == $this->session->storyBrowseType ? ' ' . $pager->recTotal . '' : ''), '', "id='{$menuItem->name}Tab' class='btn btn-link" . ($this->session->storyBrowseType == $menuItemName ? ' btn-active-text' : '') . "'"); + elseif($menuItem->name == 'QUERY') + { + $searchBrowseLink = $this->createLink($this->app->rawModule, $this->app->rawMethod, $projectIDParam . "productID=$productID&branch=$branch&browseType=$menuBrowseType¶m=%s&storyType=$storyType"); + $isBySearch = $this->session->storyBrowseType == 'bysearch'; + include '../../common/view/querymenu.html.php'; + } + else + { + $menuItemName = strtolower($menuItem->name); + echo html::a($this->createLink($this->app->rawModule, $this->app->rawMethod, $projectIDParam . "productID=$productID&branch=$branch&browseType=$menuBrowseType¶m=0&storyType=$storyType"), "$menuItem->text" . ($menuItemName == $this->session->storyBrowseType ? ' ' . $pager->recTotal . '' : ''), '', "id='{$menuItem->name}Tab' class='btn btn-link" . ($this->session->storyBrowseType == $menuItemName ? ' btn-active-text' : '') . "'"); + } } } ?>