Skip to content
Snippets Groups Projects
Commit c6098dc3 authored by Satish's avatar Satish
Browse files

Fixes #662 - vt7: RelatedList.tpl many unnecessary calls to RELATED_MODULE->getName()

parent e953d337
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
layouts/v7/modules/Campaigns/RelatedList.tpl
+ 3
− 3
View file @ c6098dc3
......@@ -18,7 +18,7 @@
<input type="hidden" name="emailEnabledModules" value=true />
<input type="hidden" id="view" value="{$VIEW}" />
<input type="hidden" name="currentPageNum" value="{$PAGING->getCurrentPage()}" />
<input type="hidden" name="relatedModuleName" class="relatedModuleName" value="{$RELATED_MODULE->get('name')}" />
<input type="hidden" name="relatedModuleName" class="relatedModuleName" value="{$RELATED_MODULE_NAME}" />
<input type="hidden" value="{$ORDER_BY}" id="orderBy">
<input type="hidden" value="{$SORT_ORDER}" id="sortOrder">
<input type="hidden" value="{$RELATED_ENTIRES_COUNT}" id="noOfEntries">
......@@ -124,7 +124,7 @@
<i class="fa fa-sort customsort"></i>
{/if}
&nbsp;
{vtranslate($HEADER_FIELD->get('label'), $RELATED_MODULE->get('name'))}
{vtranslate($HEADER_FIELD->get('label'), $RELATED_MODULE_NAME)}
&nbsp;{if $COLUMN_NAME eq $HEADER_FIELD->get('column')}<img class="{$SORT_IMAGE}">{/if}&nbsp;
</a>
{if $COLUMN_NAME eq $HEADER_FIELD->get('column')}
......@@ -133,7 +133,7 @@
</th>
{/foreach}
<th class="nowrap">
<a href="javascript:void(0);" class="listViewContentHeaderValues noSorting">{vtranslate('Status', $RELATED_MODULE->get('name'))}</a>
<a href="javascript:void(0);" class="listViewContentHeaderValues noSorting">{vtranslate('Status', $RELATED_MODULE_NAME)}</a>
</th>
</tr>
<tr class="searchRow">
......
layouts/v7/modules/PriceBooks/RelatedList.tpl
+ 4
− 3
View file @ c6098dc3
......@@ -9,12 +9,13 @@
{* modules/PriceBooks/views/Detail.php *}
{strip}
{if $RELATED_MODULE->get('name') neq 'Products' && $RELATED_MODULE->get('name') neq 'Services'}
{assign var=RELATED_MODULE_NAME value=$RELATED_MODULE->get('name')}
{if $RELATED_MODULE_NAME neq 'Products' && $RELATED_MODULE_NAME neq 'Services'}
{include file='RelatedList.tpl'|vtemplate_path:'Vtiger'}
{else}
<div class="relatedContainer">
<input type="hidden" name="currentPageNum" value="{$PAGING->getCurrentPage()}" />
<input type="hidden" name="relatedModuleName" class="relatedModuleName" value="{$RELATED_MODULE->get('name')}" />
<input type="hidden" name="relatedModuleName" class="relatedModuleName" value="{$RELATED_MODULE_NAME}" />
<input type="hidden" value="{$ORDER_BY}" id="orderBy">
<input type="hidden" value="{$SORT_ORDER}" id="sortOrder">
<input type="hidden" value="{$RELATED_ENTIRES_COUNT}" id="noOfEntries">
......@@ -33,7 +34,7 @@
</th>
{foreach item=HEADER_FIELD from=$RELATED_HEADERS}
<th nowrap {if $HEADER_FIELD@last} {/if}>
<a href="javascript:void(0);" class="listViewContentHeaderValues" data-nextsortorderval="{if $COLUMN_NAME eq $HEADER_FIELD->get('name')}{$NEXT_SORT_ORDER}{else}ASC{/if}" data-fieldname="{$HEADER_FIELD->get('name')}">{vtranslate($HEADER_FIELD->get('label'), $RELATED_MODULE->get('name'))}
<a href="javascript:void(0);" class="listViewContentHeaderValues" data-nextsortorderval="{if $COLUMN_NAME eq $HEADER_FIELD->get('name')}{$NEXT_SORT_ORDER}{else}ASC{/if}" data-fieldname="{$HEADER_FIELD->get('name')}">{vtranslate($HEADER_FIELD->get('label'), $RELATED_MODULE_NAME)}
{if $COLUMN_NAME eq $HEADER_FIELD->get('column')}
<i class="fa fa-sort {$FASORT_IMAGE}"></i>
{else}
......
layouts/v7/modules/Vtiger/RelatedList.tpl
+ 5
− 5
View file @ c6098dc3
......@@ -46,7 +46,7 @@
{else}
<th class="nowrap">
{if $HEADER_FIELD->get('column') eq "access_count" or $HEADER_FIELD->get('column') eq "idlists"}
<a href="javascript:void(0);" class="noSorting">{vtranslate($HEADER_FIELD->get('label'), $RELATED_MODULE->get('name'))}</a>
<a href="javascript:void(0);" class="noSorting">{vtranslate($HEADER_FIELD->get('label'), $RELATED_MODULE_NAME)}</a>
{else}
<a href="javascript:void(0);" class="listViewContentHeaderValues" data-nextsortorderval="{if $COLUMN_NAME eq $HEADER_FIELD->get('column')}{$NEXT_SORT_ORDER}{else}ASC{/if}" data-fieldname="{$HEADER_FIELD->get('column')}">
{if $COLUMN_NAME eq $HEADER_FIELD->get('column')}
......@@ -55,7 +55,7 @@
<i class="fa fa-sort customsort"></i>
{/if}
&nbsp;
{vtranslate($HEADER_FIELD->get('label'), $RELATED_MODULE->get('name'))}
{vtranslate($HEADER_FIELD->get('label'), $RELATED_MODULE_NAME)}
&nbsp;{if $COLUMN_NAME eq $HEADER_FIELD->get('column')}<img class="{$SORT_IMAGE}">{/if}&nbsp;
</a>
{if $COLUMN_NAME eq $HEADER_FIELD->get('column')}
......@@ -86,7 +86,7 @@
<tr class="listViewEntries" data-id='{$RELATED_RECORD->getId()}'
{if $RELATED_MODULE_NAME eq 'Calendar'}
data-recurring-enabled='{$RELATED_RECORD->isRecurringEnabled()}'
{assign var=DETAILVIEWPERMITTED value=isPermitted($RELATED_MODULE->get('name'), 'DetailView', $RELATED_RECORD->getId())}
{assign var=DETAILVIEWPERMITTED value=isPermitted($RELATED_MODULE_NAME, 'DetailView', $RELATED_RECORD->getId())}
{if $DETAILVIEWPERMITTED eq 'yes'}
data-recordUrl='{$RELATED_RECORD->getDetailViewUrl()}'
{/if}
......@@ -121,7 +121,7 @@
{assign var=RELATED_LIST_VALUE value=$RELATED_RECORD->get($RELATED_HEADERNAME)}
<td class="relatedListEntryValues" title="{strip_tags($RELATED_RECORD->getDisplayValue($RELATED_HEADERNAME))}" data-field-type="{$HEADER_FIELD->getFieldDataType()}" nowrap>
<span class="value textOverflowEllipsis">
{if $RELATED_MODULE->get('name') eq 'Documents' && $RELATED_HEADERNAME eq 'document_source'}
{if $RELATED_MODULE_NAME eq 'Documents' && $RELATED_HEADERNAME eq 'document_source'}
<center>{$RELATED_RECORD->get($RELATED_HEADERNAME)}</center>
{else}
{if $HEADER_FIELD->isNameField() eq true or $HEADER_FIELD->get('uitype') eq '4'}
......@@ -171,7 +171,7 @@
{else}
{$RELATED_RECORD->getDisplayValue($RELATED_HEADERNAME)}
{* Documents list view special actions "view file" and "download file" *}
{if $RELATED_MODULE_NAME eq 'Documents' && $RELATED_HEADERNAME eq 'filename' && isPermitted($RELATED_MODULE->get('name'), 'DetailView', $RELATED_RECORD->getId()) eq 'yes'}
{if $RELATED_MODULE_NAME eq 'Documents' && $RELATED_HEADERNAME eq 'filename' && isPermitted($RELATED_MODULE_NAME, 'DetailView', $RELATED_RECORD->getId()) eq 'yes'}
<span class="actionImages">
{assign var=RECORD_ID value=$RELATED_RECORD->getId()}
{assign var="DOCUMENT_RECORD_MODEL" value=Vtiger_Record_Model::getInstanceById($RECORD_ID)}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Copyright 2023 Vtiger. All rights reserved.