diff --git a/data/CRMEntity.php b/data/CRMEntity.php index 84bc172f945334ec782f9cb53256057631ebe7ef..daede567cda6d20cf3a35dd89d49aca281d32121 100644 --- a/data/CRMEntity.php +++ b/data/CRMEntity.php @@ -3140,7 +3140,7 @@ class TrackableObject implements ArrayAccess, IteratorAggregate { #[\ReturnTypeWillChange] function offsetSet($key, $value) { - if(is_array($value)) $value = !empty($value) && array_key_exists(0,$value) ? $value[0] : ""; + if(is_array($value)) $value = !empty($value) && array_key_exists(0,$value) ? $value[0] : ""; //modified to prevent warning of Undefined array key 0 . if($this->tracking && $this->trackingEnabled) { $olderValue = $this->offsetGet($key); // decode_html only expects string diff --git a/layouts/v7/modules/Vtiger/DetailViewBlockView.tpl b/layouts/v7/modules/Vtiger/DetailViewBlockView.tpl index 49729c4c152c19f03a2616e8e1cc2cd60ff7a50d..0c2673d2662a245aa3ae0f683cc13ee8993452ae 100644 --- a/layouts/v7/modules/Vtiger/DetailViewBlockView.tpl +++ b/layouts/v7/modules/Vtiger/DetailViewBlockView.tpl @@ -18,7 +18,7 @@ <div class="block block_{$BLOCK_LABEL_KEY}" data-block="{$BLOCK_LABEL_KEY}" data-blockid="{$BLOCK_LIST[$BLOCK_LABEL_KEY]->get('id')}"> {assign var=IS_HIDDEN value=$BLOCK->isHidden()} {assign var=WIDTHTYPE value=$USER_MODEL->get('rowheight')} - <input type=hidden name="timeFormatOptions" data-value='{if isset($DAY_STARTS)}{/if}' /> + <input type=hidden name="timeFormatOptions" data-value='{if isset($DAY_STARTS)}{$DAY_STARTS}{else}""{/if}' /> <div> <h4 class="textOverflowEllipsis maxWidth50"> <img class="cursorPointer alignMiddle blockToggle {if !($IS_HIDDEN)} hide {/if}" src="{vimage_path('arrowRight.png')}" data-mode="hide" data-id={$BLOCK_LIST[$BLOCK_LABEL_KEY]->get('id')}> diff --git a/layouts/v7/modules/Vtiger/OverlayEditView.tpl b/layouts/v7/modules/Vtiger/OverlayEditView.tpl index 0268557fde4e30d917d76297aa95098b699c0e33..05e9c29eac5f6007411c7b25b98f4138d3d59cdf 100644 --- a/layouts/v7/modules/Vtiger/OverlayEditView.tpl +++ b/layouts/v7/modules/Vtiger/OverlayEditView.tpl @@ -13,7 +13,7 @@ <div class='fc-overlay-modal modal-content overlayEdit'> <div class="overlayHeader"> - {assign var=TITLE value="{vtranslate('LBL_EDITING', $MODULE)} {vtranslate(isset($SINGLE_MODULE_NAME), $MODULE)} - {$RECORD_STRUCTURE_MODEL->getRecordName()}"} + {assign var=TITLE value="{vtranslate('LBL_EDITING', $MODULE)} {vtranslate(isset($SINGLE_MODULE_NAME)? $SINGLE_MODULE_NAME : '', $MODULE)} - {$RECORD_STRUCTURE_MODEL->getRecordName()}"} {include file="ModalHeader.tpl"|vtemplate_path:$MODULE} </div> <form class="form-horizontal recordEditView" id="EditView" name="edit" method="post" action="index.php" enctype="multipart/form-data"> diff --git a/modules/Vtiger/views/Detail.php b/modules/Vtiger/views/Detail.php index c4b3f43efa8bf23589fa33032dc9c93dc7a20281..ff6a69a4ab7611a22bfc54f1ffd21f07ca189dd1 100644 --- a/modules/Vtiger/views/Detail.php +++ b/modules/Vtiger/views/Detail.php @@ -319,7 +319,7 @@ class Vtiger_Detail_View extends Vtiger_Index_View { $viewer->assign('MODULE_NAME', $moduleName); $viewer->assign('IS_AJAX_ENABLED', $this->isAjaxEnabled($recordModel)); $viewer->assign('MODULE', $moduleName); - $viewer->assign('DAY_STARTS',' '); + $viewer->assign('DAY_STARTS',''); $picklistDependencyDatasource = Vtiger_DependencyPicklist::getPicklistDependencyDatasource($moduleName); $viewer->assign('PICKIST_DEPENDENCY_DATASOURCE', Vtiger_Functions::jsonEncode($picklistDependencyDatasource)); diff --git a/pkg/vtiger/modules/ModComments/modules/ModComments/views/DetailAjax.php b/pkg/vtiger/modules/ModComments/modules/ModComments/views/DetailAjax.php index 93797cab8d67c4c1a84dd97f45d9c0bca8d0cc9b..19404144ddf8679bf9fed7f0e5bdf68e1e0ce2c8 100644 --- a/pkg/vtiger/modules/ModComments/modules/ModComments/views/DetailAjax.php +++ b/pkg/vtiger/modules/ModComments/modules/ModComments/views/DetailAjax.php @@ -16,8 +16,7 @@ class ModComments_DetailAjax_View extends Vtiger_IndexAjax_View { $recordModel = ModComments_Record_Model::getInstanceById($record); $currentUserModel = Users_Record_Model::getCurrentUserModel(); $modCommentsModel = Vtiger_Module_Model::getInstance('ModComments'); - $CREATOR_NAME=decode_html($recordModel->getCommentedByName()); - $shortName = substr($CREATOR_NAME, 0, 2); + $viewer = $this->getViewer($request); $viewer->assign('CURRENTUSER', $currentUserModel); $viewer->assign('COMMENT', $recordModel);