From d3503e50a1e9b9ece644d195f5c02da843b9b408 Mon Sep 17 00:00:00 2001
From: Uma <uma.s@vtiger.com>
Date: Tue, 21 Apr 2020 11:21:50 +0530
Subject: [PATCH] Fixes #1268 top menu icon in sync with Category
---
modules/Vtiger/views/Detail.php | 5 ++++-
modules/Vtiger/views/List.php | 5 ++++-
modules/Vtiger/views/ListViewQuickPreview.php | 5 ++++-
modules/Vtiger/views/RecordQuickPreview.php | 5 ++++-
modules/Vtiger/views/RelatedList.php | 5 ++++-
5 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/modules/Vtiger/views/Detail.php b/modules/Vtiger/views/Detail.php
index 6ef1158c0..da6c136be 100644
--- a/modules/Vtiger/views/Detail.php
+++ b/modules/Vtiger/views/Detail.php
@@ -157,7 +157,10 @@ class Vtiger_Detail_View extends Vtiger_Index_View {
$allUserTags = Vtiger_Tag_Model::getAllUserTags($currentUserModel->getId());
$viewer->assign('TAGS_LIST', $tagsList);
$viewer->assign('ALL_USER_TAGS', $allUserTags);
- $viewer->assign('SELECTED_MENU_CATEGORY', 'MARKETING');
+ $appName = $request->get('app');
+ if(!empty($appName)){
+ $viewer->assign('SELECTED_MENU_CATEGORY',$appName);
+ }
$selectedTabLabel = $request->get('tab_label');
$relationId = $request->get('relationId');
diff --git a/modules/Vtiger/views/List.php b/modules/Vtiger/views/List.php
index 5c56bd5ed..7e97088ea 100644
--- a/modules/Vtiger/views/List.php
+++ b/modules/Vtiger/views/List.php
@@ -391,7 +391,10 @@ class Vtiger_List_View extends Vtiger_Index_View {
$viewer->assign('ALL_USER_TAGS', $this->allUserTags);
$viewer->assign('ALL_CUSTOMVIEW_MODEL', CustomView_Record_Model::getAllFilterByModule($moduleName));
$viewer->assign('CURRENT_TAG',$tag);
- $viewer->assign('SELECTED_MENU_CATEGORY', 'MARKETING');
+ $appName = $request->get('app');
+ if(!empty($appName)){
+ $viewer->assign('SELECTED_MENU_CATEGORY',$appName);
+ }
if (PerformancePrefs::getBoolean('LISTVIEW_COMPUTE_PAGE_COUNT', false)) {
if(!$this->listViewCount){
$this->listViewCount = $listViewModel->getListViewCount();
diff --git a/modules/Vtiger/views/ListViewQuickPreview.php b/modules/Vtiger/views/ListViewQuickPreview.php
index 3b0761e28..66e2f1ba2 100644
--- a/modules/Vtiger/views/ListViewQuickPreview.php
+++ b/modules/Vtiger/views/ListViewQuickPreview.php
@@ -62,7 +62,10 @@ class Vtiger_ListViewQuickPreview_View extends Vtiger_Index_View {
$viewer->assign('MODULE_NAME', $moduleName);
$viewer->assign('SUMMARY_RECORD_STRUCTURE', $recordStrucure->getStructure());
$viewer->assign('$SOCIAL_ENABLED', false);
- $viewer->assign('SELECTED_MENU_CATEGORY', 'MARKETING');
+ $appName = $request->get('app');
+ if(!empty($appName)){
+ $viewer->assign('SELECTED_MENU_CATEGORY',$appName);
+ }
$viewer->assign('LIST_PREVIEW', true);
$pageNumber = 1;
diff --git a/modules/Vtiger/views/RecordQuickPreview.php b/modules/Vtiger/views/RecordQuickPreview.php
index 3a41e56d2..98a1d751e 100644
--- a/modules/Vtiger/views/RecordQuickPreview.php
+++ b/modules/Vtiger/views/RecordQuickPreview.php
@@ -41,7 +41,10 @@ class Vtiger_RecordQuickPreview_View extends Vtiger_Index_View {
$viewer->assign('SUMMARY_RECORD_STRUCTURE', $recordStrucure->getStructure());
$viewer->assign('$SOCIAL_ENABLED', false);
$viewer->assign('LIST_PREVIEW', true);
- $viewer->assign('SELECTED_MENU_CATEGORY', 'MARKETING');
+ $appName = $request->get('app');
+ if(!empty($appName)){
+ $viewer->assign('SELECTED_MENU_CATEGORY',$appName);
+ }
$pageNumber = 1;
$limit = 5;
diff --git a/modules/Vtiger/views/RelatedList.php b/modules/Vtiger/views/RelatedList.php
index 6fbc3fdcf..128457400 100644
--- a/modules/Vtiger/views/RelatedList.php
+++ b/modules/Vtiger/views/RelatedList.php
@@ -108,7 +108,10 @@ class Vtiger_RelatedList_View extends Vtiger_Index_View {
$viewer->assign('RELATED_MODULE', $relatedModuleModel);
$viewer->assign('RELATED_ENTIRES_COUNT', $noOfEntries);
$viewer->assign('RELATION_FIELD', $relationField);
- $viewer->assign('SELECTED_MENU_CATEGORY', 'MARKETING');
+ $appName = $request->get('app');
+ if(!empty($appName)){
+ $viewer->assign('SELECTED_MENU_CATEGORY',$appName);
+ }
if (PerformancePrefs::getBoolean('LISTVIEW_COMPUTE_PAGE_COUNT', false)) {
$totalCount = $relationListView->getRelatedEntriesCount();
--
GitLab