layouts/v7/modules/Accounts/uitypes/Text.tpl

@@ -17,7 +17,7 @@
 		{else}
 		<textarea rows="5" class="inputElement {if $FIELD_MODEL->isNameField()}nameField{/if}" name="{$FIELD_NAME}" data-validation-engine="validate[{if $FIELD_MODEL->isMandatory() eq true}required,{/if}funcCall[Vtiger_Base_Validator_Js.invokeValidation]]" data-fieldinfo='{$FIELD_INFO}' {if !empty($SPECIAL_VALIDATOR)}data-validator={Zend_Json::encode($SPECIAL_VALIDATOR)}{/if}>
 			{$FIELD_MODEL->get('fieldvalue')}</textarea>
-			{if $MODULE_NAME neq 'Webforms' && $REQ.view neq 'Detail'}
+			{if $MODULE_NAME neq 'Webforms' && $REQ->get('view') neq 'Detail'}
 				{if $FIELD_NAME eq "bill_street"}
 				<div>
 					<a class="cursorPointer" name="copyAddress" data-target="shipping">{vtranslate('LBL_COPY_SHIPPING_ADDRESS', $MODULE)}</a>

layouts/v7/modules/Calendar/CalendarView.tpl

@@ -8,7 +8,7 @@
  ************************************************************************************}
 {* modules/Calendar/views/Calendar.php *}
 {strip}
-<input type="hidden" id="currentView" value="{$REQ.view}" />
+<input type="hidden" id="currentView" value="{$REQ->get('view')}" />
 <input type="hidden" id="start_day" value="{$CURRENT_USER->get('dayoftheweek')}" />
 <input type="hidden" id="activity_view" value="{$CURRENT_USER->get('activity_view')}" />
 <input type="hidden" id="time_format" value="{$CURRENT_USER->get('hour_format')}" />

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/ModuleHeader.tpl

@@ -10,7 +10,7 @@
 {strip}
 	<div class="col-sm-12 col-xs-12 module-action-bar clearfix coloredBorderTop">
 		<div class="module-action-content clearfix {$MODULE}-module-action-content">
-			<div class="col-lg-7 col-md-7 module-breadcrumb module-breadcrumb-{$REQ.view} transitionsAllHalfSecond">
+			<div class="col-lg-7 col-md-7 module-breadcrumb module-breadcrumb-{$REQ->get('view')} transitionsAllHalfSecond">
 				{assign var=MODULE_MODEL value=Vtiger_Module_Model::getInstance($MODULE)}
 				{if $MODULE_MODEL->getDefaultViewName() neq 'List'}
 					{assign var=DEFAULT_FILTER_URL value=$MODULE_MODEL->getDefaultUrl()}
@@ -39,13 +39,13 @@
 					<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}&app={$SELECTED_MENU_CATEGORY}'>&nbsp;{$CVNAME}&nbsp;</a></p>
 				{/if}
 				{assign var=SINGLE_MODULE_NAME value='SINGLE_'|cat:$MODULE}
-				{if $RECORD and $REQ.view eq 'Edit'}
+				{if $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.view eq 'Edit'}
+				{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>
 				{/if}
 
-				{if $REQ.view eq 'Detail'}
+				{if $REQ->get('view') eq 'Detail'}
 					<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;{$RECORD->get('label')}&nbsp;</a></p>
 				{/if}
 			</div>

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/SharedCalendarView.tpl

@@ -8,7 +8,7 @@
  ************************************************************************************}
 {* modules/Calendar/views/SharedCalendar.php *}
 {strip}
-<input type="hidden" id="currentView" value="{$REQ.view}" />
+<input type="hidden" id="currentView" value="{$REQ->get('view')}" />
 <input type="hidden" id="start_day" value="{$CURRENT_USER->get('dayoftheweek')}" />
 <input type="hidden" id="activity_view" value="{$CURRENT_USER->get('activity_view')}" />
 <input type="hidden" id="time_format" value="{$CURRENT_USER->get('hour_format')}" />

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).
@@ -788,12 +792,12 @@ Vtiger.Class("Calendar_Calendar_Js", {
 			}
 
 			thisInstance.checkDuplicateFeed(moduleName, fieldName, selectedColor, conditions).then(
-					function (result) {
-						thisInstance.saveFeedSettings(modalContainer);
+					function(result) {
+					    app.helper.showErrorNotification({'message':result['message']});
+					    currentTarget.removeAttr('disabled');
 					},
-					function (result) {
-						app.helper.showErrorNotification({'message': result['message']});
-						currentTarget.removeAttr('disabled');
+					function() {
+					    thisInstance.saveFeedSettings(modalContainer);
 					});
 		});
 	},