layouts/v7/modules/Reports/step3.tpl

@@ -22,7 +22,7 @@
         <input type="hidden" name="reports_description" value="{Vtiger_Util_Helper::toSafeHTML($REPORT_MODEL->get('description'))}" />
         <input type="hidden" name="primary_module" value="{$PRIMARY_MODULE}" />
         <input type="hidden" name="secondary_modules" value={ZEND_JSON::encode($SECONDARY_MODULES)} />
-        <input type="hidden" name="selected_fields" id="seleted_fields" value='{Vtiger_Util_Helper::toSafeHTML($REPORT_MODEL->get('selected_fields'))}' />
+        <input type="hidden" name="selected_fields" id="selected_fields" value='{Vtiger_Util_Helper::toSafeHTML($REPORT_MODEL->get('selected_fields'))}' />
         <input type="hidden" name="selected_sort_fields" id="selected_sort_fields" value={Vtiger_Util_Helper::toSafeHTML($REPORT_MODEL->get('selected_sort_fields'))} />
         <input type="hidden" name="selected_calculation_fields" id="calculation_fields" value={Vtiger_Util_Helper::toSafeHTML($REPORT_MODEL->get('calculation_fields'))} />
         <input type="hidden" name="advanced_filter" id="advanced_filter" value="" />
@@ -64,6 +64,9 @@
                 <h4><strong>{vtranslate('LBL_CHOOSE_FILTER_CONDITIONS',$MODULE)}</strong></h4>
                 <br>
                 <span class="col-lg-12">
+                {if !isset($SELECTED_ADVANCED_FILTER_FIELDS)}
+                    {assign var="SELECTED_ADVANCED_FILTER_FIELDS" value=array()}
+                {/if}
                     {include file='AdvanceFilter.tpl'|@vtemplate_path RECORD_STRUCTURE=$RECORD_STRUCTURE ADVANCE_CRITERIA=$SELECTED_ADVANCED_FILTER_FIELDS COLUMNNAME_API=getReportFilterColumnName}
                 </span>
             </div>

layouts/v7/modules/Rss/ModuleHeader.tpl

@@ -27,7 +27,7 @@
 				<span>
 					<p class="current-filter-name pull-left">&nbsp;<span class="fa fa-angle-right" aria-hidden="true"></span>&nbsp;{$VIEW}&nbsp;</p>
 				</span>
-				{if $VIEWID}
+				{if isset($VIEWID) && $VIEWID}
 					{foreach item=FILTER_TYPES from=$CUSTOM_VIEWS}
 						{foreach item=FILTERS from=$FILTER_TYPES}
 							{if $FILTERS->get('cvid') eq $VIEWID}

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"/>&nbsp;
+							<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"/>&nbsp;
 						</div>
 						<div class="controls fieldValue col-xs-3" style="padding-left: 0px;">
 							<select class="select2 inputElement" id="time_format">

layouts/v7/modules/Settings/ExtensionStore/CardSetupModals.tpl

@@ -15,8 +15,8 @@
 		{assign var=HEADER_TITLE value={vtranslate('LBL_SETUP_CARD', $QUALIFIED_MODULE)}}
 		{include file="ModalHeader.tpl"|vtemplate_path:$MODULE TITLE=$HEADER_TITLE}
 		<form class="form-horizontal setUpCardForm">
-			<input type="hidden" name="customerId" value="{$CUSTOMER_PROFILE['id']}" />
-			<input type="hidden" name="customerCardId" value="{$CUSTOMER_PROFILE['CustomerCardId']}" />
+			<input type="hidden" name="customerId" value="{(isset($CUSTOMER_PROFILE['id'])) ? $CUSTOMER_PROFILE['id'] : ''}" />
+			<input type="hidden" name="customerCardId" value="{(isset($CUSTOMER_PROFILE['CustomerCardId'])) ? $CUSTOMER_PROFILE['CustomerCardId'] : ''}" />
 			<input type="hidden" name="module" value="ExtensionStore" />
 			<input type="hidden" name="parent" value="Settings" />
 			<input type="hidden" name="action" value="Basic" />
@@ -84,13 +84,13 @@
 				<div class="col-sm-3 col-xs-3">
 					{vtranslate('LBL_CARD_NUMBER', $QUALIFIED_MODULE)}
 				</div>
-				<div class="col-sm-4 col-xs-4 cardNumber">{$CUSTOMER_CARD_INFO['number']}</div>
+				<div class="col-sm-4 col-xs-4 cardNumber">{(isset($CUSTOMER_CARD_INFO['number'])) ? $CUSTOMER_CARD_INFO['number'] : ''}</div>
 			</div>
 			<div class="row marginBottom10px">
 				<div class="col-sm-3 col-xs-3">
 					{vtranslate('LBL_EXPIRY_DATE', $QUALIFIED_MODULE)}
 				</div>
-				<div class="col-sm-4 col-xs-4 expiryDate">{$CUSTOMER_CARD_INFO['expmonth']}&nbsp;-&nbsp;{$CUSTOMER_CARD_INFO['expyear']}</div>
+				<div class="col-sm-4 col-xs-4 expiryDate">{(isset($CUSTOMER_CARD_INFO['expmonth'])) ? $CUSTOMER_CARD_INFO['expmonth'] : ''}&nbsp;-&nbsp;{(isset($CUSTOMER_CARD_INFO['expyear'])) ? $CUSTOMER_CARD_INFO['expyear'] : ''}</div>
 			</div>
 			<div class="row marginBottom10px">
 				<div class="col-sm-3 col-xs-3 securityCode">

layouts/v7/modules/Settings/LayoutEditor/DefaultValueUi.tpl

@@ -15,10 +15,10 @@
 			</label>
 			<div class="controls col-sm-7">
 				<div class="defaultValueUi">
-					{if !$NAME_ATTR}
+					{if !isset($NAME_ATTR) || !$NAME_ATTR}
 						{assign var=NAME_ATTR value="fieldDefaultValue"}
 					{/if}
-					{if $DEFAULT_VALUE eq false && !$IS_SET}
+					{if (!isset($DEFAULT_VALUE) || $DEFAULT_VALUE eq false) && (!isset($IS_SET) || !$IS_SET)}
 						{assign var=DEFAULT_VALUE value=$FIELD_MODEL->get('defaultvalue')}
 					{/if}
 
@@ -83,7 +83,7 @@
 					{else if $FIELD_MODEL->getFieldDataType() eq "text"}
 						<textarea class="input-lg col-sm-4" name="{$NAME_ATTR}"  style="resize: vertical">{$DEFAULT_VALUE}</textarea>
 					{else}
-						<input type="text" class="inputElement col-sm-3" name="{$NAME_ATTR}" value="{$DEFAULT_VALUE}" style='width: 75%'/>
+						<input type="text" class="inputElement col-sm-3" name="{$NAME_ATTR}" value="{(isset($DEFAULT_VALUE)) ? $DEFAULT_VALUE : ''}" style='width: 75%'/>
 					{/if}
 				</div>
 			</div>

layouts/v7/modules/Settings/LayoutEditor/DuplicateHandling.tpl

@@ -10,7 +10,7 @@
 {strip}
 	<div class="duplicateHandlingDiv padding20">
 		<form class="duplicateHandlingForm">
-			<input type="hidden" name="_source" value="{$SOURCE}" />
+			<input type="hidden" name="_source" value="{(isset($SOURCE)) ? $SOURCE : ''}" />
 			<input type="hidden" name="sourceModule" value="{$SOURCE_MODULE}" id="sourceModule" />
 			<input type="hidden" name="parent" value="Settings" />
 			<input type="hidden" name="module" value="LayoutEditor" />

layouts/v7/modules/Settings/LayoutEditor/FieldCreate.tpl

@@ -20,8 +20,8 @@
 		<div class="modal-content">
 			<form class="form-horizontal createCustomFieldForm">
 				<input type="hidden" name="fieldid" value="{$FIELD_MODEL->getId()}" />
-				<input type="hidden" name="addToBaseTable" value="{$ADD_TO_BASE_TABLE}" />
-				<input type="hidden" name="_source" value="{$SOURCE}" />
+				<input type="hidden" name="addToBaseTable" value="{(isset($ADD_TO_BASE_TABLE)) ? $ADD_TO_BASE_TABLE : ''}" />
+				<input type="hidden" name="_source" value="{(isset($SOURCE)) ? $SOURCE : ''}" />
 				<input type="hidden" name="fieldname" value="{$FIELD_MODEL->get('name')}" />
 				<input type="hidden" id="headerFieldsCount" value="{$HEADER_FIELDS_COUNT}" />
 				<div class="modal-body model-body-scrollenabled">
@@ -122,9 +122,12 @@
 							</label>
 							<div class="controls col-sm-7">
 								<select class="col-sm-6 relationModule" name="relationmodule[]" multiple data-rule-required='true'>
+								{if isset($FIELD_TYPE_INFO['Relation'])}
 									{foreach item=RELATION_MODULE_NAME from=$FIELD_TYPE_INFO['Relation']['relationModules']}
 										<option value="{$RELATION_MODULE_NAME}">{vtranslate($RELATION_MODULE_NAME,$RELATION_MODULE_NAME)}</option>
 									{/foreach}
+								{/if}
+									
 								</select>
 							</div>
 						</div>
@@ -211,7 +214,7 @@
 										<input type="hidden" name="headerfield" value="0"/>
 										<label class="checkbox" style="margin-left: 9%;">
 											<input type="checkbox" class="{if $FIELD_MODEL->isHeaderFieldOptionDisabled()} cursorPointerNotAllowed {else} cursorPointer{/if}" name="headerfield" value="1" {if $FIELD_MODEL->get('headerfield') eq '1'}checked="checked"{/if}
-												{if $FIELD_MODEL->isHeaderFieldOptionDisabled() || $IS_NAME_FIELD}readonly="readonly"{/if} />
+												{if $FIELD_MODEL->isHeaderFieldOptionDisabled() || isset($IS_NAME_FIELD) && $IS_NAME_FIELD}readonly="readonly"{/if} />
 										</label>
 									</div>
 								</div>

layouts/v7/modules/Settings/LayoutEditor/FieldsList.tpl

@@ -167,7 +167,7 @@
 															<div class="defaultValue col-sm-12 {if !$FIELD_MODEL->hasDefaultValue()}disabled{/if} 
 																 {if $FIELD_MODEL->isDefaultValueOptionDisabled()} cursorPointerNotAllowed {/if}">
 																{assign var=DEFAULT_VALUE value=$FIELD_MODEL->getDefaultFieldValueToViewInV7FieldsLayOut()}
-																{if $DEFAULT_VALUE}
+																{if isset($DEFAULT_VALUE) && $DEFAULT_VALUE !== ''}
 																	{if is_array($DEFAULT_VALUE)}
 																		{foreach key=DEFAULT_FIELD_NAME item=DEFAULT_FIELD_VALUE from=$DEFAULT_VALUE}
 																			<div class="row">
@@ -341,7 +341,7 @@
 															<div class="defaultValue col-sm-12 {if !$FIELD_MODEL->hasDefaultValue()}disabled{/if} 
 																 {if $FIELD_MODEL->isDefaultValueOptionDisabled()} cursorPointerNotAllowed {/if}">
 																{assign var=DEFAULT_VALUE value=$FIELD_MODEL->getDefaultFieldValueToViewInV7FieldsLayOut()}
-																{if $DEFAULT_VALUE}
+																{if isset($DEFAULT_VALUE) && $DEFAULT_VALUE !== ''}
 																	{if is_array($DEFAULT_VALUE)}
 																		{foreach key=DEFAULT_FIELD_NAME item=DEFAULT_FIELD_VALUE from=$DEFAULT_VALUE}
 																			<div class="row defaultValueContent">

layouts/v7/modules/Settings/MailConverter/resources/Edit.js

@@ -22,6 +22,13 @@ Settings_Vtiger_Index_Js('Settings_MailConverter_Edit_Js', {
 		form.submit(function (e) {
 			e.preventDefault();
 		});
+
+		jQuery('[name="server"]', form).on('blur', function(ev){
+			if (((this.value||"").toLowerCase()).indexOf("imap.gmail.com") != -1) {
+				// TODO disable submit and clear button
+				location.href = "oauth2callback/index.php?authfor=MailConverter&authservice=Google"
+			}
+		});
 	},
 
 	saveMailBox: function (form) {
@@ -133,4 +140,4 @@ Settings_Vtiger_Index_Js('Settings_MailConverter_Edit_Js', {
 		Settings_MailConverter_Edit_Js.firstStep();
 		Settings_MailConverter_Edit_Js.activateHeader();
 	}
-});
\ No newline at end of file
+});

layouts/v7/modules/Settings/ModuleManager/ImportUserModuleStep2.tpl

@@ -12,7 +12,7 @@
 		<div>
 			<div class="row">
 				<div id="vtlib_modulemanager_import_div">
-					{if $MODULEIMPORT_FAILED neq ''}
+					{if isset ($MODULEIMPORT_FAILED) && $MODULEIMPORT_FAILED neq ''}
 						<div class="col-lg-2"></div>
 						<div class="col-lg-10">
 							<b>{vtranslate('LBL_FAILED', $QUALIFIED_MODULE)}</b>
@@ -87,10 +87,10 @@
 		<div class="modal-overlay-footer clearfix">
 			<div class="row clearfix">
 				<div class="textAlignCenter col-lg-12 col-md-12 col-sm-12">
-					{if $MODULEIMPORT_FAILED neq ''}
+					{if isset($MODULEIMPORT_FAILED) && $MODULEIMPORT_FAILED neq ''}
 						<button class="btn btn-success finishButton" type="submit"><strong>{vtranslate('LBL_FINISH', $QUALIFIED_MODULE)}</strong></button>
 					{else if $MODULEIMPORT_EXISTS eq 'true' || $MODULEIMPORT_DIR_EXISTS eq 'true'}
-						<button class="btn btn-success updateModule" name="saveButton" {if $need_license_agreement eq 'true'} disabled {/if}>{vtranslate('LBL_UPDATE_NOW', $QUALIFIED_MODULE)}</button>
+						<button class="btn btn-success updateModule" name="saveButton" {if isset($need_license_agreement) && $need_license_agreement eq 'true'} disabled {/if}>{vtranslate('LBL_UPDATE_NOW', $QUALIFIED_MODULE)}</button>
 					{else}
 						<button class="btn btn-success importModule" name="saveButton" {if $need_license_agreement eq 'true'} disabled {/if}><strong>{vtranslate('LBL_IMPORT_NOW', $QUALIFIED_MODULE)}</strong></button>
 					{/if}

layouts/v7/modules/Settings/PickListDependency/DependencyGraph.tpl

@@ -87,7 +87,7 @@
                     {foreach key=TARGET_VALUE item=TRANSLATED_TARGET_VALUE from=$TARGET_PICKLIST_VALUES}
                         <tr>
                             {foreach key=SOURCE_PICKLIST_VALUE item=TRANSLATED_SOURCE_PICKLIST_VALUE from=$SOURCE_PICKLIST_VALUES}
-                                {assign var=targetValues value=$MAPPED_TARGET_PICKLIST_VALUES[$SAFEHTML_SOURCE_PICKLIST_VALUES[$SOURCE_PICKLIST_VALUE]]}
+                                {assign var=targetValues value=(isset($MAPPED_TARGET_PICKLIST_VALUES[$SAFEHTML_SOURCE_PICKLIST_VALUES[$SOURCE_PICKLIST_VALUE]])) ? $MAPPED_TARGET_PICKLIST_VALUES[$SAFEHTML_SOURCE_PICKLIST_VALUES[$SOURCE_PICKLIST_VALUE]] : array()}
                                 {assign var=IS_SELECTED value=false}
                                 {if empty($targetValues) || in_array($TARGET_VALUE, $targetValues)}
                                     {assign var=IS_SELECTED value=true}

layouts/v7/modules/Settings/Roles/EditView.tpl

@@ -68,6 +68,11 @@
                                 <div class="radio">
                                     <label>
                                     <input type="radio" value="2" {if $RECORD_MODEL->get('allowassignedrecordsto') eq '2'} checked="" {/if} name="allowassignedrecordsto" data-handler="new" class="alignTop"/>
+                                    &nbsp;{vtranslate('LBL_USERS_WITH_SAME_LEVEL_AND_SUBORDINATES',$QUALIFIED_MODULE)}</label>
+                                </div>
+                                <div class="radio">
+                                    <label>
+                                    <input type="radio" value="4" {if $RECORD_MODEL->get('allowassignedrecordsto') eq '4'} checked="" {/if} name="allowassignedrecordsto" data-handler="new" class="alignTop"/>
                                     &nbsp;{vtranslate('LBL_USERS_WITH_SAME_OR_LOWER_LEVEL',$QUALIFIED_MODULE)}</label>
                                 </div>
                                 <div class="radio">

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)}
-												&nbsp;{if $COLUMN_NAME eq $LISTVIEW_HEADER->get('name')}<img class="{$SORT_IMAGE} icon-white">{/if}</a>&nbsp;
+											<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)}
+												&nbsp;{if isset($COLUMN_NAME) && $COLUMN_NAME eq $LISTVIEW_HEADER->get('name')}<img class="{$SORT_IMAGE} icon-white">{/if}</a>&nbsp;
 										</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;">

layouts/v7/modules/Settings/Vtiger/OutgoingServerEdit.tpl

@@ -43,7 +43,9 @@
 										<div class=" col-lg-6 col-md-6 col-sm-12">
 											<select class="select2 inputElement col-lg-12 col-md-12 col-lg-12" name="serverType">
 												<option value="">{vtranslate('LBL_SELECT_OPTION','Vtiger')}</option>
-												<option value="{"ssl://smtp.gmail.com:465"}" {if {$MODEL->get('server')} eq "ssl://smtp.gmail.com:465"} selected {/if}>{vtranslate('LBL_GMAIL', $QUALIFIED_MODULE)} </option>
+												<option value="google-oauth2" {if {$MODEL->get('server')} eq "ssl://smtp.gmail.com:465" and {$MODEL->get('smtp_auth_type')} eq "XOAUTH2"} selected {/if}>{vtranslate('LBL_GMAIL', $QUALIFIED_MODULE)} OAuth2</option>
+												{* Google disabled Password based from Sep 30, 2024 *}
+												{* <option value="{"ssl://smtp.gmail.com:465"}" {if {$MODEL->get('server')} eq "ssl://smtp.gmail.com:465" and {$MODEL->get('smtp_auth_type')} neq "XOAUTH2"} selected {/if}>{vtranslate('LBL_GMAIL', $QUALIFIED_MODULE)}</option> *}
 												<option value="{"smtp.live.com"}" {if {$MODEL->get('server')} eq "smtp.live.com"} selected {/if}>{vtranslate('LBL_HOTMAIL', $QUALIFIED_MODULE)}</option>
 												<option value="{"smtp-mail.outlook.com"}" {if {$MODEL->get('server')} eq "smtp.live.com"} selected {/if}>{vtranslate('LBL_OFFICE365', $QUALIFIED_MODULE)}</option>
 												<option value="{"smtp.mail.yahoo.com"}" {if {$MODEL->get('server')} eq "smtp.mail.yahoo.com"} selected {/if}>{vtranslate('LBL_YAHOO', $QUALIFIED_MODULE)}</option>

layouts/v7/modules/Settings/Vtiger/resources/OutgoingServer.js

@@ -170,15 +170,9 @@ Vtiger.Class("Settings_Vtiger_OutgoingServer_Js",{},{
             form.find('[name="serverType"]').on('change',function(e){
                 
                 var servertypevalue=form.find('[name="serverType"]').val();
-				form.find('[name="server"]').val(servertypevalue);
-                
-                if(servertypevalue === "mail.od1.vtiger.com"){
-                   var vtigerUser= form.find('[name="vtigerServer"]').data("username");
-                   var vtigerpassword= form.find('[name="vtigerServer"]').data("password");
-                   var vtigeremail= form.find('[name="vtigerServer"]').data("email");
-                    form.find('[name="server_username"]').val(vtigerUser);
-                    form.find('[name="server_password"]').val(vtigerpassword);
-                    form.find('[name="from_email_field"]').val(vtigeremail);
+				              
+                if(servertypevalue === "google-oauth2"){
+                   window.location.href = "oauth2callback/index.php?authfor=OutgoingServer&authservice=Google";
                 }else{
 					form.find('[name="server_username"]').val("");
 					form.find('[name="server_password"]').val("");

layouts/v7/modules/Settings/Workflows/AdvanceFilter.tpl

@@ -53,7 +53,7 @@
 				<button type="button" class="btn btn-default">{vtranslate('LBL_ADD_CONDITION',$MODULE)}</button>
 			</div>
 			<div class="groupCondition">
-				{assign var=GROUP_CONDITION value=$ALL_CONDITION_CRITERIA['condition']}
+				{assign var=GROUP_CONDITION value=(isset($ALL_CONDITION_CRITERIA['condition'])) ? $ALL_CONDITION_CRITERIA['condition'] : ''}
 				{if empty($GROUP_CONDITION)}
 					{assign var=GROUP_CONDITION value="and"}
 				{/if}

layouts/v7/modules/Settings/Workflows/AdvanceFilterCondition.tpl

@@ -26,7 +26,7 @@
 						{assign var=columnNameApi value=getCustomViewColumnName}
 					{/if}
 					<option value="{$FIELD_MODEL->$columnNameApi()}" data-fieldtype="{$FIELD_MODEL->getFieldType()}" data-field-name="{$FIELD_NAME}"
-					{if decode_html($FIELD_MODEL->$columnNameApi()) eq $CONDITION_INFO['columnname']}
+					{if isset($CONDITION_INFO['columnname']) && decode_html($FIELD_MODEL->$columnNameApi()) eq $CONDITION_INFO['columnname']}
 						{assign var=FIELD_TYPE value=$FIELD_MODEL->getFieldDataType()}
 						{assign var=SELECTED_FIELD_MODEL value=$FIELD_MODEL}
 						{$FIELD_INFO['value'] = decode_html($CONDITION_INFO['value'])}
@@ -68,18 +68,27 @@
 	<span class="conditionComparator col-lg-3 col-md-3 col-sm-3">
 		<select class="{if empty($NOCHOSEN)}select2{/if} col-lg-12" name="comparator" data-placeholder="{vtranslate('LBL_NONE',$QUALIFIED_MODULE)}">
 			 <option value="none">{vtranslate('LBL_NONE',$MODULE)}</option>
-			{assign var=ADVANCE_FILTER_OPTIONS value=$ADVANCED_FILTER_OPTIONS_BY_TYPE[$FIELD_TYPE]}
-			{foreach item=ADVANCE_FILTER_OPTION from=$ADVANCE_FILTER_OPTIONS}
+			 {if isset($FIELD_TYPE)}
+				{assign var=ADVANCE_FILTER_OPTIONS value=$ADVANCED_FILTER_OPTIONS_BY_TYPE[$FIELD_TYPE]}
+				{foreach item=ADVANCE_FILTER_OPTION from=$ADVANCE_FILTER_OPTIONS}
 				<option value="{$ADVANCE_FILTER_OPTION}"
                                 {if $ADVANCE_FILTER_OPTION === $CONDITION_INFO['comparator']}
                                         selected
                                 {/if}
                                 >{vtranslate($ADVANCED_FILTER_OPTIONS[$ADVANCE_FILTER_OPTION])}</option>
 			{/foreach}
+			 {/if}
+			
 		</select>
 	</span>
 	<span class="col-lg-4 col-md-4 col-sm-4  fieldUiHolder">
-		<input name="{if $SELECTED_FIELD_MODEL}{$SELECTED_FIELD_MODEL->get('name')}{/if}" data-value="value" class="inputElement col-lg-12" type="text" value="{$CONDITION_INFO['value']|escape}" />
+	{if isset($CONDITION_INFO['value'])}
+		{assign var=CONDITIONINFO value=$CONDITION_INFO['value'] }
+		
+		{else}
+			{assign var=CONDITIONINFO value=''}
+	{/if}
+		<input name="{if isset($SELECTED_FIELD_MODEL) && $SELECTED_FIELD_MODEL}{$SELECTED_FIELD_MODEL->get('name')}{/if}" data-value="value" class="inputElement col-lg-12" type="text" value="{$CONDITIONINFO|escape}" />
 	</span>
 	<span class="hide">
 		<!-- TODO : see if you need to respect CONDITION_INFO condition or / and  -->

layouts/v7/modules/Settings/Workflows/CreateEntity.tpl

@@ -10,7 +10,7 @@
 
 {* START YOUR IMPLEMENTATION FROM BELOW. Use {debug} for information *}
 <input type="hidden" id="fieldValueMapping" name="field_value_mapping" value='{$TASK_OBJECT->field_value_mapping}' />
-<input type="hidden" value="{if $TASK_ID}{$TASK_OBJECT->reference_field}{else}{$REFERENCE_FIELD_NAME}{/if}" name='reference_field' id='reference_field' />
+<input type="hidden" value="{if $TASK_ID}{$TASK_OBJECT->reference_field}{else}{(isset($REFERENCE_FIELD_NAME)) ? $REFERENCE_FIELD_NAME : ''}{/if}" name='reference_field' id='reference_field' />
 <div class="conditionsContainer" id="save_fieldvaluemapping">
 	{if $RELATED_MODULE_MODEL_NAME neq '' && getTabid($RELATED_MODULE_MODEL_NAME)}
 		<div>
@@ -56,7 +56,7 @@
 
 		{include file="FieldExpressions.tpl"|@vtemplate_path:$QUALIFIED_MODULE RELATED_MODULE_MODEL=$RELATED_MODULE_MODEL MODULE_MODEL=$MODULE_MODEL FIELD_EXPRESSIONS=$FIELD_EXPRESSIONS}
 	{else}
-		{if $RELATED_MODULE_MODEL}
+		{if isset($RELATED_MODULE_MODEL) && $RELATED_MODULE_MODEL}
 			<div>
 				<button type="button" class="btn btn-default" id="addFieldBtn">{vtranslate('LBL_ADD_FIELD',$QUALIFIED_MODULE)}</button>
 			</div><br>
@@ -94,7 +94,7 @@
 		{/if}
 	{/if}
 </div><br>
-{if $RELATED_MODULE_MODEL}
+{if isset($RELATED_MODULE_MODEL) && $RELATED_MODULE_MODEL}
 	<div class="row form-group basicAddFieldContainer hide">
 		<span class="col-lg-4">
 			<select name="fieldname" style="min-width: 250px">

layouts/v7/modules/Settings/Workflows/EditView.tpl

@@ -50,7 +50,7 @@
                            {vtranslate('LBL_TARGET_MODULE', $QUALIFIED_MODULE)}
                         </label>
                      <div class="col-sm-5 controls">
-                         {if $MODE eq 'edit'}
+                         {if isset($MODE) && $MODE eq 'edit'}
                              <div class="pull-left">
                                 <input type='text' disabled='disabled' class="inputElement" value="{vtranslate($MODULE_MODEL->getName(), $MODULE_MODEL->getName())}" >
                                 <input type='hidden' id="module_name" name='module_name' value="{$MODULE_MODEL->get('name')}" >

layouts/v7/modules/Settings/Workflows/FieldExpressions.tpl

@@ -35,7 +35,7 @@
                             {/foreach}
                         </select>
                     </span>
-                    {if $RELATED_MODULE_MODEL neq ''}
+                    {if isset($RELATED_MODULE_MODEL) && $RELATED_MODULE_MODEL neq ''}
                         <span name="{$RELATED_MODULE_MODEL->get('name')}" class="useFieldElement">
                             {assign var=MODULE_FIELDS value=$RELATED_MODULE_MODEL->getFields()}
                             <select class="useField" data-placeholder="{vtranslate('LBL_USE_FIELD',$QUALIFIED_MODULE)}" style="min-width: 160px;">