layouts/v7/modules/Calendar/ListViewRecordActions.tpl

@@ -30,10 +30,10 @@
 			</span>
 		{/if}
 		{assign var=EDIT_VIEW_URL value={$LISTVIEW_ENTRY->getEditViewUrl()}}
-		{if $IS_MODULE_EDITABLE && $EDIT_VIEW_URL && $LISTVIEW_ENTRY->get('taskstatus') neq vtranslate('Held', $MODULE) && $LISTVIEW_ENTRY->get('taskstatus') neq vtranslate('Completed', $MODULE)}
+		{if isset($IS_MODULE_EDITABLE) && $IS_MODULE_EDITABLE && $EDIT_VIEW_URL && $LISTVIEW_ENTRY->get('taskstatus') neq vtranslate('Held', $MODULE) && $LISTVIEW_ENTRY->get('taskstatus') neq vtranslate('Completed', $MODULE)}
 			<span class="fa fa-check icon action markAsHeld" title="{vtranslate('LBL_MARK_AS_HELD', $MODULE)}" onclick="Calendar_Calendar_Js.markAsHeld('{$LISTVIEW_ENTRY->getId()}');"></span>
 		{/if}
-		{if $IS_CREATE_PERMITTED && $EDIT_VIEW_URL && $LISTVIEW_ENTRY->get('taskstatus') eq vtranslate('Held', $MODULE)}
+		{if isset($IS_CREATE_PERMITTED) && $IS_CREATE_PERMITTED && $EDIT_VIEW_URL && $LISTVIEW_ENTRY->get('taskstatus') eq vtranslate('Held', $MODULE)}
 			<span class="fa fa-flag icon action holdFollowupOn" title="{vtranslate('LBL_HOLD_FOLLOWUP_ON', "Events")}" onclick="Calendar_Calendar_Js.holdFollowUp('{$LISTVIEW_ENTRY->getId()}');"></span>
 		{/if}
 		<span class="more dropdown action">
@@ -41,7 +41,7 @@
 				<i class="fa fa-ellipsis-v icon"></i></span>
 			<ul class="dropdown-menu">
 				<li><a data-id="{$LISTVIEW_ENTRY->getId()}" href="{$LISTVIEW_ENTRY->getFullDetailViewUrl()}&app={$SELECTED_MENU_CATEGORY}">{vtranslate('LBL_DETAILS', $MODULE)}</a></li>
-					{if $RECORD_ACTIONS}
+					{if isset($RECORD_ACTIONS) && $RECORD_ACTIONS}
 						{if $RECORD_ACTIONS['edit']}
 						<li><a data-id="{$LISTVIEW_ENTRY->getId()}" href="javascript:void(0);" data-url="{$LISTVIEW_ENTRY->getEditViewUrl()}&app={$SELECTED_MENU_CATEGORY}" name="editlink">{vtranslate('LBL_EDIT', $MODULE)}</a></li>
 						{/if}

layouts/v7/modules/Calendar/QuickCreate.tpl

@@ -88,7 +88,7 @@
 							<table class="massEditTable table no-border">
 								<tr>
 									{foreach key=FIELD_NAME item=FIELD_MODEL from=$RECORD_STRUCTURE name=blockfields}
-									{if $FIELD_NAME eq 'subject' || $FIELD_NAME eq 'date_start' || $FIELD_NAME eq 'due_date'}
+									{if $FIELD_NAME eq 'subject' || $FIELD_NAME eq 'date_start' || $FIELD_NAME eq 'due_date' || $FIELD_NAME eq 'time_start'}
 								</tr>{continue}
 								{/if}
 								{assign var="isReferenceField" value=$FIELD_MODEL->getFieldDataType()}

layouts/v7/modules/Calendar/TaskManagement.tpl

@@ -38,7 +38,11 @@
 							{assign var=FIELD_INFO value=$FIELD_MODEL->getFieldInfo()}
 							{assign var=PICKLIST_VALUES value=$FIELD_INFO['picklistvalues']}
 							{assign var=FIELD_INFO value=Vtiger_Util_Helper::toSafeHTML(Zend_Json::encode($FIELD_INFO))}
-							{assign var=SEARCH_VALUES value=explode(',',$SEARCH_INFO['searchValue'])}
+							{if isset($SEARCH_INFO) && isset($SEARCH_INFO['searchValue'])}
+								{assign var=SEARCH_VALUES value=explode(',', $SEARCH_INFO['searchValue'])}
+							{else}
+								{assign var=SEARCH_VALUES value=array()}
+							{/if}
 							<select class="select2 listSearchContributor" name="{$FIELD_MODEL->get('name')}" multiple data-fieldinfo='{$FIELD_INFO|escape}'>
 								{foreach item=PICKLIST_LABEL key=PICKLIST_KEY from=$PICKLIST_VALUES}
 									<option {if $PICKLIST_KEY|in_array:$TASK_FILTERS['status']}selected{/if} value="{$PICKLIST_KEY}">{$PICKLIST_LABEL}</option>
@@ -83,4 +87,4 @@
 			</div>
 		</div>
 	</div>
-{/strip}
\ No newline at end of file
+{/strip}

layouts/v7/modules/Calendar/resources/Calendar.js

@@ -559,7 +559,11 @@ Vtiger.Class("Calendar_Calendar_Js", {
 					feedIndicatorTemplate.removeClass('.feed-indicator-template');
 					var newFeedIndicator = feedIndicatorTemplate.clone(true, true);
 					//replacing module name prefix with translated module name and concatinating with field name
-					feedIndicatorTitle = translatedModuleName + feedIndicatorTitle.substr(feedIndicatorTitle.indexOf('-'));
+					var feedIndicatorModuleEndIndex = feedIndicatorTitle.indexOf('('); // Events (ActivityType) - title...
+					if (feedIndicatorModuleEndIndex == -1) { // ModuleName - title...
+							feedIndicatorModuleEndIndex = feedIndicatorTitle.indexOf('-');
+					}
+					feedIndicatorTitle = translatedModuleName + feedIndicatorTitle.substr(feedIndicatorModuleEndIndex);
 					newFeedIndicator.find('span:first').text(feedIndicatorTitle);
 					var newFeedCheckbox = newFeedIndicator.find('.toggleCalendarFeed');
 					newFeedCheckbox.attr('data-calendar-sourcekey', calendarSourceKey).

layouts/v7/modules/Calendar/uitypes/DateTime.tpl

@@ -20,8 +20,10 @@
 {/if}
 
 {assign var=DATE_TIME_VALUE value=$FIELD_MODEL->get('fieldvalue')}
-{assign var=DATE_TIME_COMPONENTS value=explode(' ' ,$DATE_TIME_VALUE)}
-{if !empty($TIME_FIELD)}
+{if isset($DATE_TIME_VALUE)}
+    {assign var=DATE_TIME_COMPONENTS value=explode(' ', $DATE_TIME_VALUE)}
+{/if}
+{if !empty($TIME_FIELD) && isset($DATE_TIME_COMPONENTS)}
 	{assign var=TIME_FIELD value=$TIME_FIELD->set('fieldvalue',$DATE_TIME_COMPONENTS[1])}
 {/if}
 {if $TIME_FIELD}
@@ -30,6 +32,7 @@
 {assign var=DATE_TIME_COMPONENTS value=explode(' ' ,$DATE_TIME_CONVERTED_VALUE)}
 {assign var=DATE_FIELD value=$DATE_FIELD->set('fieldvalue',$DATE_TIME_COMPONENTS[0])}
 {/if}
+
 <div>
 	{include file=vtemplate_path('uitypes/Date.tpl',$MODULE) BLOCK_FIELDS=$BLOCK_FIELDS FIELD_MODEL=$DATE_FIELD}
 </div>

layouts/v7/modules/Calendar/uitypes/OwnerFieldTaskSearchView.tpl

@@ -14,8 +14,13 @@
 	{assign var=ASSIGNED_USER_ID value=$FIELD_MODEL->get('name')}
         {assign var="FIELD_INFO" value=$FIELD_MODEL->getFieldInfo()}
 	{assign var=ALL_ACTIVEUSER_LIST value=$FIELD_INFO['picklistvalues'][vtranslate('LBL_USERS')]}
-	{assign var=SEARCH_VALUES value=explode(',',$SEARCH_INFO['searchValue'])}
-	{assign var=SEARCH_VALUES value=array_map("trim",$SEARCH_VALUES)}
+
+	{if isset($SEARCH_INFO) && isset($SEARCH_INFO['searchValue'])}
+		{assign var=SEARCH_VALUES value=explode(',',$SEARCH_INFO['searchValue'])}
+		{assign var=SEARCH_VALUES value=array_map("trim",$SEARCH_VALUES)}
+	{else}
+		{assign var=SEARCH_VALUES value=array()}
+	{/if}
 
 	{if $FIELD_MODEL->get('uitype') eq '52' || $FIELD_MODEL->get('uitype') eq '77'}
 		{assign var=ALL_ACTIVEGROUP_LIST value=array()}
@@ -52,4 +57,4 @@
 		{/if}
 	</select>
 	</div>
-{/strip}
\ No newline at end of file
+{/strip}

layouts/v7/modules/Campaigns/RelatedList.tpl

@@ -146,8 +146,12 @@
 										{if $HEADER_FIELD->get('column') eq 'time_start' or $HEADER_FIELD->get('column') eq 'time_end' or $HEADER_FIELD->getFieldDataType() eq 'reference'}
 										{else}
 											{assign var=FIELD_UI_TYPE_MODEL value=$HEADER_FIELD->getUITypeModel()}
-											{include file=vtemplate_path($FIELD_UI_TYPE_MODEL->getListSearchTemplateName(),$RELATED_MODULE_NAME) FIELD_MODEL= $HEADER_FIELD SEARCH_INFO=$SEARCH_DETAILS[$HEADER_FIELD->getName()] USER_MODEL=$USER_MODEL}
-											<input type="hidden" class="operatorValue" value="{$SEARCH_DETAILS[$HEADER_FIELD->getName()]['comparator']}">
+											{assign var=FIELD_SEARCH_INFO value=array("searchValue" => "", "comparator" => "")}
+											{if isset($SEARCH_DETAILS[$HEADER_FIELD->getName()])}
+												{assign var=FIELD_SEARCH_INFO value=$SEARCH_DETAILS[$HEADER_FIELD->getName()]}
+											{/if}
+											{include file=vtemplate_path($FIELD_UI_TYPE_MODEL->getListSearchTemplateName(),$RELATED_MODULE_NAME) FIELD_MODEL= $HEADER_FIELD SEARCH_INFO= $FIELD_SEARCH_INFO USER_MODEL=$USER_MODEL}
+											<input type="hidden" class="operatorValue" value="{$FIELD_SEARCH_INFO['comparator']}">
 										{/if}
 									</th>
 								{/foreach}

layouts/v7/modules/Contacts/resources/Detail.js

@@ -31,7 +31,7 @@ Vtiger_Detail_Js("Contacts_Detail_Js", {}, {
 				return false;
 			}
 
-			var primaryEmailValue = primaryEmailField["0"].data("value");
+			var primaryEmailValue = primaryEmailField.data("value");
 			if (primaryEmailValue == "") {
 				app.helper.showErrorNotification({message: app.vtranslate('JS_PLEASE_ENTER_PRIMARY_EMAIL_VALUE_TO_ENABLE_PORTAL_USER')});
 				return false;
@@ -47,4 +47,4 @@ Vtiger_Detail_Js("Contacts_Detail_Js", {}, {
 		this._super();
 		this.registerAjaxPreSaveEvents(form);
 	}
-})
\ No newline at end of file
+})

layouts/v7/modules/CustomView/EditView.tpl

@@ -84,6 +84,7 @@
 										</optgroup>
 									{/foreach}
 									{*Required to include event fields for columns in calendar module advanced filter*}
+									{if isset($EVENT_RECORD_STRUCTURE) && is_array($EVENT_RECORD_STRUCTURE)}
 									{foreach key=BLOCK_LABEL item=BLOCK_FIELDS from=$EVENT_RECORD_STRUCTURE}
 										<optgroup label='{vtranslate($BLOCK_LABEL, 'Events')}'>
 											{foreach key=FIELD_NAME item=FIELD_MODEL from=$BLOCK_FIELDS}
@@ -104,6 +105,7 @@
 											{/foreach}
 										</optgroup>
 									{/foreach}
+									{/if}
 								</select>
 								<input type="hidden" name="columnslist" value='{Vtiger_Functions::jsonEncode($SELECTED_FIELDS)}' />
 								<input id="mandatoryFieldsList" type="hidden" value='{Vtiger_Util_Helper::toSafeHTML(ZEND_JSON::encode($MANDATORY_FIELDS))}' />

layouts/v7/modules/Documents/CreateDocument.tpl

@@ -22,13 +22,13 @@
 					<input type="hidden" name="module" value="{$MODULE}" />
 					<input type="hidden" name="action" value="SaveAjax" />
 					<input type="hidden" name="document_source" value="Vtiger" />
-					<input type="hidden" name='service' value="{$STORAGE_SERVICE}" />
+				<input type="hidden" name='service' value="{if isset($STORAGE_SERVICE)}{$STORAGE_SERVICE}{/if}" />
 					<input type="hidden" name='type' value="{$FILE_LOCATION_TYPE}" />
-					{if $RELATION_OPERATOR eq 'true'}
+					{if isset($RELATION_OPERATOR) && $RELATION_OPERATOR eq 'true'}
 						<input type="hidden" name="relationOperation" value="{$RELATION_OPERATOR}" />
 						<input type="hidden" name="sourceModule" value="{$PARENT_MODULE}" />
 						<input type="hidden" name="sourceRecord" value="{$PARENT_ID}" />
-						{if $RELATION_FIELD_NAME}
+						{if isset($RELATION_FIELD_NAME) && $RELATION_FIELD_NAME}
 							<input type="hidden" name="{$RELATION_FIELD_NAME}" value="{$PARENT_ID}" /> 
 						{/if}
 					{/if}

layouts/v7/modules/Documents/ModuleHeader.tpl

@@ -41,7 +41,7 @@
 					<p  class="current-filter-name filter-name pull-left cursorPointer" title="{$CVNAME}">&nbsp;<span class="fa fa-angle-right pull-left" aria-hidden="true"></span><a  href='{$MODULE_MODEL->getListViewUrl()}&viewname={$VIEWID}'>&nbsp;{$CVNAME}&nbsp;</a> </p>
 				{/if}
 				{assign var=SINGLE_MODULE_NAME value='SINGLE_'|cat:$MODULE}
-				{if $RECORD and $REQ->get('view') eq 'Edit'}
+				{if isset($RECORD) and $RECORD and $REQ->get('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')}">&nbsp;{vtranslate('LBL_EDITING', $MODULE)} : {$RECORD->get('label')}&nbsp;</a></p>
 				{else if $REQ->get('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>&nbsp;{vtranslate('LBL_ADDING_NEW', $MODULE)}&nbsp;</a></p>

layouts/v7/modules/Documents/UploadDocument.tpl

@@ -23,11 +23,11 @@
 								<input type="hidden" name="module" value="{$MODULE}" />
 								<input type="hidden" name="action" value="SaveAjax" />
 								<input type="hidden" name="document_source" value="Vtiger" />
-								{if $RELATION_OPERATOR eq 'true'}
+								{if isset($RELATION_OPERATOR) && $RELATION_OPERATOR eq 'true'}
 									<input type="hidden" name="relationOperation" value="{$RELATION_OPERATOR}" />
 									<input type="hidden" name="sourceModule" value="{$PARENT_MODULE}" />
 									<input type="hidden" name="sourceRecord" value="{$PARENT_ID}" />
-									{if $RELATION_FIELD_NAME}
+									{if isset($RELATION_FIELD_NAME)}
 										<input type="hidden" name="{$RELATION_FIELD_NAME}" value="{$PARENT_ID}" /> 
 									{/if}
 								{/if}
@@ -47,7 +47,7 @@
 										<div class="fileUploadBtn btn btn-primary">
 											<span><i class="fa fa-laptop"></i> {vtranslate('LBL_SELECT_FILE_FROM_COMPUTER', $MODULE)}</span>
 											{assign var=FIELD_MODEL value=$FIELD_MODELS['filename']}
-											<input type="file" name="{$FIELD_MODEL->getFieldName()}" value="{$FIELD_VALUE}" data-rule-required="true" />
+							<input type="file" name="{$FIELD_MODEL->getFieldName()}" value="{if isset($FIELD_VALUE)}{$FIELD_VALUE}{/if}" data-rule-required="true" />
 										</div>
 										&nbsp;&nbsp;&nbsp;<i class="fa fa-info-circle cursorPointer" data-toggle="tooltip" title="{vtranslate('LBL_MAX_UPLOAD_SIZE', $MODULE)} {$MAX_UPLOAD_LIMIT_MB}{vtranslate('MB', $MODULE)}"></i>
 									</div>