From d8e1ea79390ef0a9c1a89bdc738f1f7f878c5cfb Mon Sep 17 00:00:00 2001 From: Uma <uma.s@vtiger.com> Date: Fri, 8 May 2020 15:09:07 +0530 Subject: [PATCH] Fixes #1276 listName in ModuleHeader breadcrumb is reverted --- layouts/v7/modules/Calendar/ModuleHeader.tpl | 14 ++++++++++++++ layouts/v7/modules/Documents/ModuleHeader.tpl | 14 ++++++++++++++ layouts/v7/modules/Vtiger/ModuleHeader.tpl | 14 ++++++++++++++ 3 files changed, 42 insertions(+) diff --git a/layouts/v7/modules/Calendar/ModuleHeader.tpl b/layouts/v7/modules/Calendar/ModuleHeader.tpl index fd045514f..7a33c402c 100644 --- a/layouts/v7/modules/Calendar/ModuleHeader.tpl +++ b/layouts/v7/modules/Calendar/ModuleHeader.tpl @@ -24,6 +24,20 @@ {/if} {/if} <a title="{vtranslate($MODULE, $MODULE)}" href='{$DEFAULT_FILTER_URL}&app={$SELECTED_MENU_CATEGORY}'><h4 class="module-title pull-left text-uppercase"> {vtranslate($MODULE, $MODULE)} </h4></a> + {if $smarty.session.lvs.$MODULE.viewname} + {assign var=VIEWID value=$smarty.session.lvs.$MODULE.viewname} + {/if} + {if $VIEWID} + {foreach item=FILTER_TYPES from=$CUSTOM_VIEWS} + {foreach item=FILTERS from=$FILTER_TYPES} + {if $FILTERS->get('cvid') eq $VIEWID} + {assign var=CVNAME value=$FILTERS->get('viewname')} + {break} + {/if} + {/foreach} + {/foreach} + <p class="current-filter-name filter-name pull-left cursorPointer" title="{$CVNAME}"> <span class="fa fa-angle-right pull-left" aria-hidden="true"></span><a href='{$MODULE_MODEL->getListViewUrl()}&viewname={$VIEWID}&app={$SELECTED_MENU_CATEGORY}'> {$CVNAME} </a></p> + {/if} {assign var=SINGLE_MODULE_NAME value='SINGLE_'|cat:$MODULE} {if $RECORD and $smarty.request.view eq 'Edit'} <p class="current-filter-name filter-name pull-left "><span class="fa fa-angle-right pull-left" aria-hidden="true"></span><a title="{$RECORD->get('label')}"> {vtranslate('LBL_EDITING', $MODULE)} : {$RECORD->get('label')} </a></p> diff --git a/layouts/v7/modules/Documents/ModuleHeader.tpl b/layouts/v7/modules/Documents/ModuleHeader.tpl index fde6978d2..5d0cb4859 100644 --- a/layouts/v7/modules/Documents/ModuleHeader.tpl +++ b/layouts/v7/modules/Documents/ModuleHeader.tpl @@ -26,6 +26,20 @@ {/if} {/if} <a title="{vtranslate($MODULE, $MODULE)}" href='{$DEFAULT_FILTER_URL}&app={$SELECTED_MENU_CATEGORY}'><h4 class="module-title pull-left textOverflowEllipsis text-uppercase"> {vtranslate($MODULE, $MODULE)} </h4></a> + {if $smarty.session.lvs.$MODULE.viewname} + {assign var=VIEWID value=$smarty.session.lvs.$MODULE.viewname} + {/if} + {if $VIEWID} + {foreach item=FILTER_TYPES from=$CUSTOM_VIEWS} + {foreach item=FILTERS from=$FILTER_TYPES} + {if $FILTERS->get('cvid') eq $VIEWID} + {assign var=CVNAME value=$FILTERS->get('viewname')} + {break} + {/if} + {/foreach} + {/foreach} + <p class="current-filter-name filter-name pull-left cursorPointer" title="{$CVNAME}"> <span class="fa fa-angle-right pull-left" aria-hidden="true"></span><a href='{$MODULE_MODEL->getListViewUrl()}&viewname={$VIEWID}'> {$CVNAME} </a> </p> + {/if} {assign var=SINGLE_MODULE_NAME value='SINGLE_'|cat:$MODULE} {if $RECORD and $smarty.request.view eq 'Edit'} <p class="current-filter-name filter-name pull-left "><span class="fa fa-angle-right pull-left" aria-hidden="true"></span><a title="{$RECORD->get('label')}"> {vtranslate('LBL_EDITING', $MODULE)} : {$RECORD->get('label')} </a></p> diff --git a/layouts/v7/modules/Vtiger/ModuleHeader.tpl b/layouts/v7/modules/Vtiger/ModuleHeader.tpl index 92dad436a..963978fd8 100644 --- a/layouts/v7/modules/Vtiger/ModuleHeader.tpl +++ b/layouts/v7/modules/Vtiger/ModuleHeader.tpl @@ -24,6 +24,20 @@ {/if} {/if} <a title="{vtranslate($MODULE, $MODULE)}" href='{$DEFAULT_FILTER_URL}&app={$SELECTED_MENU_CATEGORY}'><h4 class="module-title pull-left text-uppercase"> {vtranslate($MODULE, $MODULE)} </h4> </a> + {if $smarty.session.lvs.$MODULE.viewname} + {assign var=VIEWID value=$smarty.session.lvs.$MODULE.viewname} + {/if} + {if $VIEWID} + {foreach item=FILTER_TYPES from=$CUSTOM_VIEWS} + {foreach item=FILTERS from=$FILTER_TYPES} + {if $FILTERS->get('cvid') eq $VIEWID} + {assign var=CVNAME value=$FILTERS->get('viewname')} + {break} + {/if} + {/foreach} + {/foreach} + <p class="current-filter-name filter-name pull-left cursorPointer" title="{$CVNAME}"><span class="fa fa-angle-right pull-left" aria-hidden="true"></span><a href='{$MODULE_MODEL->getListViewUrl()}&viewname={$VIEWID}&app={$SELECTED_MENU_CATEGORY}'> {$CVNAME} </a> </p> + {/if} {assign var=SINGLE_MODULE_NAME value='SINGLE_'|cat:$MODULE} {if $RECORD and $smarty.request.view eq 'Edit'} <p class="current-filter-name filter-name pull-left "><span class="fa fa-angle-right pull-left" aria-hidden="true"></span><a title="{$RECORD->get('label')}"> {vtranslate('LBL_EDITING', $MODULE)} : {$RECORD->get('label')} </a></p> -- GitLab