From 461b3a5e6f52d7a2a4ccbbc341881de3f7e023b8 Mon Sep 17 00:00:00 2001
From: yogeshwar <yogeshwar.g@vtigersolutions.com>
Date: Mon, 20 May 2024 12:54:53 +0530
Subject: [PATCH] E-all Cleanups-Leads
---
data/CRMEntity.php | 2 +-
layouts/v7/modules/Vtiger/DetailViewBlockView.tpl | 2 +-
layouts/v7/modules/Vtiger/OverlayEditView.tpl | 2 +-
modules/Vtiger/views/Detail.php | 2 +-
.../ModComments/modules/ModComments/views/DetailAjax.php | 3 +--
5 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/data/CRMEntity.php b/data/CRMEntity.php
index 84bc172f9..daede567c 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 49729c4c1..0c2673d26 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 0268557fd..05e9c29ea 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 c4b3f43ef..ff6a69a4a 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 93797cab8..19404144d 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);
--
GitLab