From 92d6715328668f994bbed502f6052c17a1b13a6f Mon Sep 17 00:00:00 2001
From: Uma <uma.s@vtiger.com>
Date: Thu, 15 Jul 2021 19:56:57 +0530
Subject: [PATCH] Cleaned up migration to fetch entityfields for userlabel
---
layouts/v7/modules/Users/resources/Edit.js | 1 +
modules/Migration/schema/730_to_740.php | 20 +++++++-------------
2 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/layouts/v7/modules/Users/resources/Edit.js b/layouts/v7/modules/Users/resources/Edit.js
index 551617fe6..ff72b0d83 100644
--- a/layouts/v7/modules/Users/resources/Edit.js
+++ b/layouts/v7/modules/Users/resources/Edit.js
@@ -51,6 +51,7 @@ Vtiger_Edit_Js("Users_Edit_Js",{},{
}
if(newPassword != confirmPassword){
app.helper.showErrorNotification({message :app.vtranslate('JS_REENTER_PASSWORDS')});
+ editForm.find('.saveButton').removeAttr('disabled');
e.preventDefault();
}
diff --git a/modules/Migration/schema/730_to_740.php b/modules/Migration/schema/730_to_740.php
index 563270f25..4ed57ff16 100644
--- a/modules/Migration/schema/730_to_740.php
+++ b/modules/Migration/schema/730_to_740.php
@@ -35,17 +35,11 @@ if (defined('VTIGER_UPGRADE')) {
echo "<br>Successfully added <b>$fieldName</b> field to <b>$moduleName</b><br>";
}
}
- $db->pquery("UPDATE vtiger_users SET $fieldName=TRIM(CONCAT(first_name, ' ' , last_name))", array());
- echo "<br>Successfully updated <b>$fieldName</b> value as concatenate of firstname and lastname for <b>$moduleName</b> module<br>";
-
- vimport('~modules/Users/CreateUserPrivilegeFile.php');
- $result = $db->pquery('SELECT id FROM vtiger_users', array());
- $count = $db->num_rows($result);
- while ($row = $db->fetch_array($result)) {
- $userId = $row['id'];
- createUserPrivilegesfile($userId);
- echo "<br>Successfully recreated <b>User's privileges</b> file for id:<b>$userId</b><br>";
- }
- echo "<br>Successfully completed concatenate of firstname and lastname as label in <b>$moduleName</b> module<br>";
-
+
+ $entityFields = Vtiger_Functions::getEntityModuleInfo($moduleName);
+ $entityFieldNames = explode(',', $entityFields['fieldname']);
+ $sql = "UPDATE vtiger_users SET $fieldName = TRIM(CONCAT(".implode(' ', $entityFieldNames)."))";
+ $db->pquery($sql, array());
+
+ Vtiger_Access::syncSharingAccess();
}
\ No newline at end of file
--
GitLab