Skip to content
Snippets Groups Projects
Commit fa6a3f97 authored by Uma's avatar Uma
Browse files

Merge branch 'fix_1523_1' into '7.4.0' 

Fix for #1523 - Optimization of record label computation.

**Areas validated**

* User CRUD (both admin and non-admin)
* Create or Update records from workflows
* CRUD from APIs

See merge request !756
parents 519c4ac2 0fe720fc
No related branches found
No related tags found
2 merge requests!802Field Mapping ID fix,!793#1533 issue on date formate
Hide whitespace changes
Inline Side-by-side
data/CRMEntity.php
+ 45
− 8
View file @ fa6a3f97
......@@ -278,6 +278,23 @@ class CRMEntity {
if ($module == 'Events') {
$module = 'Calendar';
}
$entityFields = Vtiger_Functions::getEntityModuleInfo($module);
$entityFieldNames = explode(',', $entityFields['fieldname']);
switch ($module) {
case 'HelpDesk': $entityFieldNames = array('ticket_title');
break;
case 'Documents': $entityFieldNames = array('notes_title');
break;
}
$record_label = '';
foreach($entityFieldNames as $entityFieldName) {
$record_label .= $this->column_fields[$entityFieldName]." ";
}
$label = decode_html($record_label);
$this->column_fields['label'] = $label;
if ($this->mode == 'edit') {
$description_val = from_html($this->column_fields['description'], ($insertion_mode == 'edit') ? true : false);
......@@ -291,8 +308,8 @@ class CRMEntity {
$acl = Vtiger_AccessControl::loadUserPrivileges($current_user->id);
if ($acl->is_admin == true || $acl->profileGlobalPermission[1] == 0 || $acl->profileGlobalPermission[2] == 0 || $this->isWorkFlowFieldUpdate) {
$sql = "update vtiger_crmentity set smownerid=?, smgroupid=?,modifiedby=?,description=?, modifiedtime=? where crmid=?";
$params = array($ownerid, $groupid, $current_user->id, $description_val, $adb->formatDate($date_var, true), $this->id);
$sql = "update vtiger_crmentity set smownerid=?, smgroupid=?,modifiedby=?,description=?, modifiedtime=?";
$params = array($ownerid, $groupid, $current_user->id, $description_val, $adb->formatDate($date_var, true));
} else {
$profileList = getCurrentUserProfileList();
$perm_qry = "SELECT columnname FROM vtiger_field INNER JOIN vtiger_profile2field ON vtiger_profile2field.fieldid = vtiger_field.fieldid INNER JOIN vtiger_def_org_field ON vtiger_def_org_field.fieldid = vtiger_field.fieldid WHERE vtiger_field.tabid = ? AND vtiger_profile2field.visible = 0 AND vtiger_profile2field.readonly = 0 AND vtiger_profile2field.profileid IN (" . generateQuestionMarks($profileList) . ") AND vtiger_def_org_field.visible = 0 and vtiger_field.tablename='vtiger_crmentity' and vtiger_field.displaytype in (1,3) and vtiger_field.presence in (0,2);";
......@@ -302,13 +319,22 @@ class CRMEntity {
$columname[] = $adb->query_result($perm_result, $i, "columnname");
}
if (is_array($columname) && in_array("description", $columname)) {
$sql = "update vtiger_crmentity set smownerid=?, smgroupid=?, modifiedby=?,description=?, modifiedtime=? where crmid=?";
$params = array($ownerid, $groupid, $current_user->id, $description_val, $adb->formatDate($date_var, true), $this->id);
$sql = "update vtiger_crmentity set smownerid=?, smgroupid=?, modifiedby=?,description=?, modifiedtime=?";
$params = array($ownerid, $groupid, $current_user->id, $description_val, $adb->formatDate($date_var, true));
} else {
$sql = "update vtiger_crmentity set smownerid=?, smgroupid=?,modifiedby=?, modifiedtime=? where crmid=?";
$params = array($ownerid, $groupid, $current_user->id, $adb->formatDate($date_var, true), $this->id);
$sql = "update vtiger_crmentity set smownerid=?, smgroupid=?,modifiedby=?, modifiedtime=?";
$params = array($ownerid, $groupid, $current_user->id, $adb->formatDate($date_var, true));
}
}
if($label) {
$sql .= ", label = ? ";
array_push($params, trim($label));
}
$sql .= " where crmid=?";
array_push($params,$this->id);
$adb->pquery($sql, $params);
$this->column_fields['modifiedtime'] = $modified_date_var;
$this->column_fields['modifiedby'] = $current_user->id;
......@@ -339,8 +365,19 @@ class CRMEntity {
}
$description_val = from_html($this->column_fields['description'], ($insertion_mode == 'edit') ? true : false);
$sql = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,smgroupid,setype,description,modifiedby,createdtime,modifiedtime,source) values(?,?,?,?,?,?,?,?,?,?)";
$params = array($current_id, $current_user->id, $ownerid, $groupid, $module, $description_val, $current_user->id, $created_date_var, $modified_date_var,$source);
$params = array("crmid" => $current_id, "smcreatorid" => $current_user->id, "smownerid" => $ownerid,
"smgroupid" => $groupid, "setype" => $module, "description" => $description_val,
"modifiedby" => $current_user->id, "createdtime" => $created_date_var,
"modifiedtime" => $modified_date_var, "source" => $source);
if($label) {
$params['label'] = trim($label);
}
$insert_columns = array_keys($params);
$insert_data = array_values($params);
$sql = "insert into vtiger_crmentity (".implode(",",$insert_columns).") values(".generateQuestionMarks($insert_data).")";
$adb->pquery($sql, $params);
$this->column_fields['createdtime'] = $created_date_var;
......
modules/Vtiger/RecordLabelUpdater.php → modules/Migration/schema/730_to_740.php
+ 19
− 0
View file @ fa6a3f97
<?php
/* +***********************************************************************************
/*+********************************************************************************
* The contents of this file are subject to the vtiger CRM Public License Version 1.0
* ("License"); You may not use this file except in compliance with the License
* The Original Code is: vtiger CRM Open Source
* The Original Code is: vtiger CRM Open Source
* The Initial Developer of the Original Code is vtiger.
* Portions created by vtiger are Copyright (C) vtiger.
* All Rights Reserved.
* *********************************************************************************** */
require_once 'include/events/VTEventHandler.inc';
*********************************************************************************/
class Vtiger_RecordLabelUpdater_Handler extends VTEventHandler {
function handleEvent($eventName, $data) {
global $adb;
if ($eventName == 'vtiger.entity.aftersave') {
$labelInfo = getEntityName($data->getModuleName(), $data->getId(), true);
if ($labelInfo) {
$label = decode_html($labelInfo[$data->getId()]);
$adb->pquery('UPDATE vtiger_crmentity SET label=? WHERE crmid=?', array($label, $data->getId()));
}
}
}
if (defined('VTIGER_UPGRADE')) {
global $current_user, $adb;
$db = PearDatabase::getInstance();
$eventManager = new VTEventsManager($db);
$className = 'Vtiger_RecordLabelUpdater_Handler';
$eventManager->unregisterHandler($className);
echo "Unregistered record label update handler.<br>";
}
\ No newline at end of file
modules/Vtiger/handlers/RecordLabelUpdater.php deleted 100644 → 0
+ 0
− 33
View file @ 519c4ac2
<?php
/* +***********************************************************************************
* The contents of this file are subject to the vtiger CRM Public License Version 1.0
* ("License"); You may not use this file except in compliance with the License
* The Original Code is: vtiger CRM Open Source
* The Initial Developer of the Original Code is vtiger.
* Portions created by vtiger are Copyright (C) vtiger.
* All Rights Reserved.
* *********************************************************************************** */
require_once 'include/events/VTEventHandler.inc';
class Vtiger_RecordLabelUpdater_Handler extends VTEventHandler {
function handleEvent($eventName, $data) {
global $adb;
if ($eventName == 'vtiger.entity.aftersave') {
$record = $data->getId();
$module = $data->getModuleName();
if($module === 'Users') {
return;
}
$labelInfo = getEntityName($module, $record, true);
if ($labelInfo) {
$label = decode_html($labelInfo[$data->getId()]);
$adb->pquery('UPDATE vtiger_crmentity SET label=? WHERE crmid=?', array($label, $record));
}
}
}
}
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Copyright 2023 Vtiger. All rights reserved.