From 9ad62348a39787c0e62fc5390ffeba4cc74a3541 Mon Sep 17 00:00:00 2001
From: Uma <uma.s@vtiger.com>
Date: Thu, 26 Dec 2019 19:26:00 +0530
Subject: [PATCH] Fixes #1233 Modtracker should update non-admin user
---
packages/vtiger/mandatory/ModTracker.zip | Bin 16942 -> 17014 bytes
.../modules/ModTracker/ModTrackerHandler.php | 12 ++++++++----
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/packages/vtiger/mandatory/ModTracker.zip b/packages/vtiger/mandatory/ModTracker.zip
index ca620cea7c868acd0016485dad2c45627441df9b..0546f0bfd1ea4178ec4db3095023619a751eba0d 100644
GIT binary patch
delta 2339
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
delta 2247
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
diff --git a/pkg/vtiger/modules/ModTracker/modules/ModTracker/ModTrackerHandler.php b/pkg/vtiger/modules/ModTracker/modules/ModTracker/ModTrackerHandler.php
index d89a94b57..dc9849a14 100644
--- a/pkg/vtiger/modules/ModTracker/modules/ModTracker/ModTrackerHandler.php
+++ b/pkg/vtiger/modules/ModTracker/modules/ModTracker/ModTrackerHandler.php
@@ -13,7 +13,11 @@ require_once 'data/VTEntityDelta.php';
class ModTrackerHandler extends VTEventHandler {
function handleEvent($eventName, $data) {
- global $adb, $current_user;
+ global $adb;
+ $current_user_id=$_SESSION["authenticated_user_id"];
+ $current_user = Users_Record_Model::getInstanceById($current_user_id, 'Users');
+ $curid=$current_user->get('id');
+ global $current_user;
$moduleName = $data->getModuleName();
$isTrackingEnabled = ModTracker::isTrackingEnabledForModule($moduleName);
if(!$isTrackingEnabled) {
@@ -47,7 +51,7 @@ class ModTrackerHandler extends VTEventHandler {
}
$adb->pquery('INSERT INTO vtiger_modtracker_basic(id, crmid, module, whodid, changedon, status)
VALUES(?,?,?,?,?,?)', Array($this->id, $recordId, $moduleName,
- $current_user->id, $changedOn, $status));
+ $curid, $changedOn, $status));
$inserted = true;
}
$adb->pquery('INSERT INTO vtiger_modtracker_detail(id,fieldname,prevalue,postvalue) VALUES(?,?,?,?)',
@@ -62,7 +66,7 @@ class ModTrackerHandler extends VTEventHandler {
$columnFields = $data->getData();
$id = $adb->getUniqueId('vtiger_modtracker_basic');
$adb->pquery('INSERT INTO vtiger_modtracker_basic(id, crmid, module, whodid, changedon, status)
- VALUES(?,?,?,?,?,?)', Array($id, $recordId, $moduleName, $current_user->id, date('Y-m-d H:i:s',time()), ModTracker::$DELETED));
+ VALUES(?,?,?,?,?,?)', Array($id, $recordId, $moduleName, $curid, date('Y-m-d H:i:s',time()), ModTracker::$DELETED));
}
if($eventName == 'vtiger.entity.afterrestore') {
@@ -70,7 +74,7 @@ class ModTrackerHandler extends VTEventHandler {
$columnFields = $data->getData();
$id = $adb->getUniqueId('vtiger_modtracker_basic');
$adb->pquery('INSERT INTO vtiger_modtracker_basic(id, crmid, module, whodid, changedon, status)
- VALUES(?,?,?,?,?,?)', Array($id, $recordId, $moduleName, $current_user->id, date('Y-m-d H:i:s',time()), ModTracker::$RESTORED));
+ VALUES(?,?,?,?,?,?)', Array($id, $recordId, $moduleName, $curid, date('Y-m-d H:i:s',time()), ModTracker::$RESTORED));
}
}
}
--
GitLab