diff --git a/layouts/v7/modules/Vtiger/ModuleRelatedTabs.tpl b/layouts/v7/modules/Vtiger/ModuleRelatedTabs.tpl index d3bc58e83963f4bc05aab5658259e1bb3ae37b3e..3a81505a997bfa8aeaf39078ce82f0105f94a7c7 100644 --- a/layouts/v7/modules/Vtiger/ModuleRelatedTabs.tpl +++ b/layouts/v7/modules/Vtiger/ModuleRelatedTabs.tpl @@ -11,16 +11,9 @@ <div class='related-tabs row'> <ul class="nav nav-tabs"> {foreach item=RELATED_LINK from=$DETAILVIEW_LINKS['DETAILVIEWTAB']} - {$engagementEnabledModules = ['Accounts','Contacts','Leads']} - {if $MODULE_NAME|in_array:$engagementEnabledModules && (trim($RELATED_LINK->getLabel()) == 'LBL_UPDATES')} - {assign var=RELATEDLINK_URL value="index.php?view=Detail&mode=showHistory&page=1&module="|cat:$MODULE_NAME|cat:"&record="|cat:$RECORD->getId()} - {assign var=RELATEDLINK_LABEL value="LBL_HISTORY"} - {assign var=RELATED_TAB_LABEL value="LBL_HISTORY"} - {else} - {assign var=RELATEDLINK_URL value=$RELATED_LINK->getUrl()} - {assign var=RELATEDLINK_LABEL value=$RELATED_LINK->getLabel()} - {assign var=RELATED_TAB_LABEL value={vtranslate('SINGLE_'|cat:$MODULE_NAME, $MODULE_NAME)}|cat:" "|cat:$RELATEDLINK_LABEL} - {/if} + {assign var=RELATEDLINK_URL value=$RELATED_LINK->getUrl()} + {assign var=RELATEDLINK_LABEL value=$RELATED_LINK->getLabel()} + {assign var=RELATED_TAB_LABEL value={vtranslate('SINGLE_'|cat:$MODULE_NAME, $MODULE_NAME)}|cat:" "|cat:$RELATEDLINK_LABEL} <li class="tab-item {if $RELATED_TAB_LABEL==$SELECTED_TAB_LABEL}active{/if}" data-url="{$RELATEDLINK_URL}&tab_label={$RELATED_TAB_LABEL}&app={$SELECTED_MENU_CATEGORY}" data-label-key="{$RELATEDLINK_LABEL}" data-link-key="{$RELATED_LINK->get('linkKey')}" > <a href="{$RELATEDLINK_URL}&tab_label={$RELATEDLINK_LABEL}&app={$SELECTED_MENU_CATEGORY}" class="textOverflowEllipsis"> <span class="tab-label"><strong>{vtranslate($RELATEDLINK_LABEL,{$MODULE_NAME})}</strong></span> @@ -43,7 +36,7 @@ {assign var=RELATEDMODULENAME value=$RELATED_LINK->getRelatedModuleName()} {assign var=RELATEDFIELDNAME value=$RELATED_LINK->get('linkFieldName')} {assign var="DETAILVIEWRELATEDLINKLBL" value= vtranslate($RELATED_LINK->getLabel(),$RELATEDMODULENAME)} - <li class="tab-item {if (trim($RELATED_LINK->getLabel())== trim($SELECTED_TAB_LABEL)) && ($RELATED_LINK->getId() == $SELECTED_RELATION_ID)}active{/if}" data-url="{$RELATED_LINK->getUrl()}&tab_label={$RELATED_LINK->getLabel()}&app={$SELECTED_MENU_CATEGORY}" data-label-key="{$RELATED_LINK->getLabel()}" + <li class="tab-item {if (trim($RELATED_LINK->getLabel())== trim($SELECTED_TAB_LABEL)) && ($RELATED_LINK->getId() == $SELECTED_RELATION_ID)}active{/if}" data-url="{$RELATED_LINK->getUrl()}&tab_label={$RELATED_LINK->getLabel()}&app={$SELECTED_MENU_CATEGORY}" data-label-key="{$RELATED_LINK->getLabel()}" data-module="{$RELATEDMODULENAME}" data-relation-id="{$RELATED_LINK->getId()}" {if $RELATEDMODULENAME eq "ModComments"} title {else} title="{$DETAILVIEWRELATEDLINKLBL}"{/if} {if $RELATEDFIELDNAME}data-relatedfield ="{$RELATEDFIELDNAME}"{/if}> <a href="index.php?{$RELATED_LINK->getUrl()}&tab_label={$RELATED_LINK->getLabel()}&app={$SELECTED_MENU_CATEGORY}" class="textOverflowEllipsis" displaylabel="{$DETAILVIEWRELATEDLINKLBL}" recordsCount="" > {if $RELATEDMODULENAME eq "ModComments"} diff --git a/modules/Vtiger/views/Detail.php b/modules/Vtiger/views/Detail.php index 2d478f277ed2f94339633fa7f59487445f267cf0..c55fc36932afdaa098bf1e8be8968d2ede6b4bdd 100644 --- a/modules/Vtiger/views/Detail.php +++ b/modules/Vtiger/views/Detail.php @@ -18,7 +18,6 @@ class Vtiger_Detail_View extends Vtiger_Index_View { $this->exposeMethod('showModuleDetailView'); $this->exposeMethod('showModuleSummaryView'); $this->exposeMethod('showModuleBasicView'); - $this->exposeMethod('showHistory'); $this->exposeMethod('showRecentActivities'); $this->exposeMethod('showRecentComments'); $this->exposeMethod('showRelatedList'); @@ -384,17 +383,6 @@ class Vtiger_Detail_View extends Vtiger_Index_View { echo $viewer->view('DetailViewSummaryContents.tpl', $moduleName, true); } - /** - * Funtion to show History view - * @param Vtiger_Request $request - */ - function showHistory(Vtiger_Request $request){ - $moduleName = $request->getModule(); - - $viewer = $this->getViewer($request); - echo $viewer->view('History.tpl', $moduleName, true); - } - /** * Added to support Engagements view in Vtiger7 * @param Vtiger_Request $request