diff --git a/layouts/v7/modules/Settings/CronTasks/EditAjax.tpl b/layouts/v7/modules/Settings/CronTasks/EditAjax.tpl index a876cf45cb9748ed50e89701a0aa90ebb65062ed..14736424dfea2c79ae5bb695bc711c90e67b5c24 100644 --- a/layouts/v7/modules/Settings/CronTasks/EditAjax.tpl +++ b/layouts/v7/modules/Settings/CronTasks/EditAjax.tpl @@ -50,7 +50,7 @@ {assign var=FIELD_VALUE value=($VALUES[0]*60)+$VALUES[1]} {/if} <div class="controls fieldValue col-xs-2"> - <input type="text" class="inputElement" value="{$FIELD_VALUE}" {if $FIELD_INFO["mandatory"] eq true} data-rule-required="true" {/if} id="frequencyValue"/> + <input type="text" class="inputElement" value="{$FIELD_VALUE}" {if isset($FIELD_INFO["mandatory"]) && $FIELD_INFO["mandatory"] eq true} data-rule-required="true" {/if} id="frequencyValue"/> </div> <div class="controls fieldValue col-xs-3" style="padding-left: 0px;"> <select class="select2 inputElement" id="time_format"> diff --git a/layouts/v7/modules/Settings/Vtiger/ListViewContents.tpl b/layouts/v7/modules/Settings/Vtiger/ListViewContents.tpl index ee22d089b49a386c0f8ecc98f903aae3e7f154e7..488f86a7b7ede79abe0b55b27e76a410e2eb9162 100644 --- a/layouts/v7/modules/Settings/Vtiger/ListViewContents.tpl +++ b/layouts/v7/modules/Settings/Vtiger/ListViewContents.tpl @@ -13,12 +13,12 @@ <input type="hidden" id="previousPageExist" value="{$PAGING_MODEL->isPrevPageExists()}" /> <input type="hidden" id="nextPageExist" value="{$PAGING_MODEL->isNextPageExists()}" /> <input type="hidden" id="totalCount" value="{$LISTVIEW_COUNT}" /> - <input type="hidden" value="{$ORDER_BY}" id="orderBy"> - <input type="hidden" value="{$SORT_ORDER}" id="sortOrder"> + <input type="hidden" value="{(isset($ORDER_BY)) ? $ORDER_BY : ''}" id="orderBy"> + <input type="hidden" value="{(isset($SORT_ORDER)) ? $SORT_ORDER : ''}" id="sortOrder"> <input type="hidden" id="totalCount" value="{$LISTVIEW_COUNT}" /> - <input type='hidden' value="{$PAGE_NUMBER}" id='pageNumber'> + <input type='hidden' value="{(isset($PAGE_NUMBER)) ? $PAGE_NUMBER : ''}" id='pageNumber'> <input type='hidden' value="{$PAGING_MODEL->getPageLimit()}" id='pageLimit'> - <input type="hidden" value="{$LISTVIEW_ENTRIES_COUNT}" id="noOfEntries"> + <input type="hidden" value="{(isset($LISTVIEW_ENTRIES_COUNT)) ? $LISTVIEW_ENTRIES_COUNT : ''}" id="noOfEntries"> <div class="col-sm-12 col-xs-12 "> <div id="listview-actions" class="listview-actions-container"> @@ -48,7 +48,7 @@ {vtranslate('LBL_ACTIONS', $QUALIFIED_MODULE)} </th> {else if $MODULE neq 'Currency'} - {if $SHOW_LISTVIEW_CHECKBOX eq true} + {if isset($SHOW_LISTVIEW_CHECKBOX) && $SHOW_LISTVIEW_CHECKBOX eq true} <th> <span class="input"> <input class="listViewEntriesMainCheckBox" type="checkbox"> @@ -63,8 +63,8 @@ {/if} {foreach item=LISTVIEW_HEADER from=$LISTVIEW_HEADERS} <th nowrap> - <a {if !($LISTVIEW_HEADER->has('sort'))} class="listViewHeaderValues cursorPointer" data-nextsortorderval="{if $COLUMN_NAME eq $LISTVIEW_HEADER->get('name')}{$NEXT_SORT_ORDER}{else}ASC{/if}" data-columnname="{$LISTVIEW_HEADER->get('name')}" {/if}>{vtranslate($LISTVIEW_HEADER->get('label'), $QUALIFIED_MODULE)} - {if $COLUMN_NAME eq $LISTVIEW_HEADER->get('name')}<img class="{$SORT_IMAGE} icon-white">{/if}</a> + <a {if !($LISTVIEW_HEADER->has('sort'))} class="listViewHeaderValues cursorPointer" data-nextsortorderval="{if isset($COLUMN_NAME) && $COLUMN_NAME eq $LISTVIEW_HEADER->get('name')}{$NEXT_SORT_ORDER}{else}ASC{/if}" data-columnname="{$LISTVIEW_HEADER->get('name')}" {/if}>{vtranslate($LISTVIEW_HEADER->get('label'), $QUALIFIED_MODULE)} + {if isset($COLUMN_NAME) && $COLUMN_NAME eq $LISTVIEW_HEADER->get('name')}<img class="{$SORT_IMAGE} icon-white">{/if}</a> </th> {/foreach} </tr> @@ -89,7 +89,7 @@ {/foreach} </tr> {/foreach} - {if $LISTVIEW_ENTRIES_COUNT eq '0'} + {if isset($LISTVIEW_ENTRIES_COUNT) && $LISTVIEW_ENTRIES_COUNT eq '0'} <tr class="emptyRecordsDiv"> {assign var=COLSPAN_WIDTH value={php7_count($LISTVIEW_HEADERS)+1}} <td colspan="{$COLSPAN_WIDTH}" style="vertical-align:inherit !important;">