From db34e75d1f2818ceedd792b47fb5cbd2e2951b75 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Sat, 24 Feb 2024 10:34:49 +0200 Subject: [PATCH] audited fields --- .../Espo/Repositories/ScheduledJob.php | 2 -- .../metadata/entityDefs/PortalRole.json | 12 ++++--- .../Resources/metadata/entityDefs/Role.json | 36 ++++++++++++------- .../metadata/entityDefs/ScheduledJob.json | 6 ++-- .../Resources/metadata/entityDefs/User.json | 24 ++++++++----- 5 files changed, 52 insertions(+), 28 deletions(-) diff --git a/application/Espo/Repositories/ScheduledJob.php b/application/Espo/Repositories/ScheduledJob.php index 941d3fe5e3..bd6053071b 100644 --- a/application/Espo/Repositories/ScheduledJob.php +++ b/application/Espo/Repositories/ScheduledJob.php @@ -39,8 +39,6 @@ use Espo\Core\Repositories\Database; */ class ScheduledJob extends Database { - protected $hooksDisabled = true; - protected function afterSave(Entity $entity, array $options = []) { parent::afterSave($entity, $options); diff --git a/application/Espo/Resources/metadata/entityDefs/PortalRole.json b/application/Espo/Resources/metadata/entityDefs/PortalRole.json index c1b7c2acae..38f8bbc11b 100644 --- a/application/Espo/Resources/metadata/entityDefs/PortalRole.json +++ b/application/Espo/Resources/metadata/entityDefs/PortalRole.json @@ -7,10 +7,12 @@ "pattern": "$noBadCharacters" }, "data": { - "type": "jsonObject" + "type": "jsonObject", + "audited": true }, "fieldData": { - "type": "jsonObject" + "type": "jsonObject", + "audited": true }, "exportPermission": { "type": "enum", @@ -18,7 +20,8 @@ "default": "not-set", "tooltip": "Role.exportPermission", "translation": "Role.options.levelList", - "view": "views/role/fields/permission" + "view": "views/role/fields/permission", + "audited": true }, "massUpdatePermission": { "type": "enum", @@ -26,7 +29,8 @@ "default": "not-set", "tooltip": "Role.massUpdatePermission", "translation": "Role.options.levelList", - "view": "views/role/fields/permission" + "view": "views/role/fields/permission", + "audited": true }, "createdAt": { "type": "datetime", diff --git a/application/Espo/Resources/metadata/entityDefs/Role.json b/application/Espo/Resources/metadata/entityDefs/Role.json index 2e812ee449..9e5c22dd51 100644 --- a/application/Espo/Resources/metadata/entityDefs/Role.json +++ b/application/Espo/Resources/metadata/entityDefs/Role.json @@ -12,7 +12,8 @@ "default": "not-set", "tooltip": true, "translation": "Role.options.levelList", - "view": "views/role/fields/permission" + "view": "views/role/fields/permission", + "audited": true }, "userPermission": { "type": "enum", @@ -20,7 +21,8 @@ "default": "not-set", "tooltip": true, "translation": "Role.options.levelList", - "view": "views/role/fields/permission" + "view": "views/role/fields/permission", + "audited": true }, "messagePermission": { "type": "enum", @@ -28,7 +30,8 @@ "default": "not-set", "tooltip": true, "translation": "Role.options.levelList", - "view": "views/role/fields/permission" + "view": "views/role/fields/permission", + "audited": true }, "portalPermission": { "type": "enum", @@ -36,7 +39,8 @@ "default": "not-set", "tooltip": true, "translation": "Role.options.levelList", - "view": "views/role/fields/permission" + "view": "views/role/fields/permission", + "audited": true }, "groupEmailAccountPermission": { "type": "enum", @@ -44,7 +48,8 @@ "default": "not-set", "tooltip": true, "translation": "Role.options.levelList", - "view": "views/role/fields/permission" + "view": "views/role/fields/permission", + "audited": true }, "exportPermission": { "type": "enum", @@ -52,7 +57,8 @@ "default": "not-set", "tooltip": true, "translation": "Role.options.levelList", - "view": "views/role/fields/permission" + "view": "views/role/fields/permission", + "audited": true }, "massUpdatePermission": { "type": "enum", @@ -60,7 +66,8 @@ "default": "not-set", "tooltip": true, "translation": "Role.options.levelList", - "view": "views/role/fields/permission" + "view": "views/role/fields/permission", + "audited": true }, "dataPrivacyPermission": { "type": "enum", @@ -68,7 +75,8 @@ "default": "not-set", "tooltip": true, "translation": "Role.options.levelList", - "view": "views/role/fields/permission" + "view": "views/role/fields/permission", + "audited": true }, "followerManagementPermission": { "type": "enum", @@ -76,7 +84,8 @@ "default": "not-set", "tooltip": true, "translation": "Role.options.levelList", - "view": "views/role/fields/permission" + "view": "views/role/fields/permission", + "audited": true }, "auditPermission": { "type": "enum", @@ -84,13 +93,16 @@ "default": "not-set", "tooltip": true, "translation": "Role.options.levelList", - "view": "views/role/fields/permission" + "view": "views/role/fields/permission", + "audited": true }, "data": { - "type": "jsonObject" + "type": "jsonObject", + "audited": true }, "fieldData": { - "type": "jsonObject" + "type": "jsonObject", + "audited": true }, "createdAt": { "type": "datetime", diff --git a/application/Espo/Resources/metadata/entityDefs/ScheduledJob.json b/application/Espo/Resources/metadata/entityDefs/ScheduledJob.json index 20fd3c687f..6eab5ffbfa 100644 --- a/application/Espo/Resources/metadata/entityDefs/ScheduledJob.json +++ b/application/Espo/Resources/metadata/entityDefs/ScheduledJob.json @@ -12,13 +12,15 @@ "status": { "type": "enum", "options": ["Active", "Inactive"], - "default": "Active" + "default": "Active", + "audited": true }, "scheduling": { "type": "varchar", "required": true, "view": "views/scheduled-job/fields/scheduling", - "tooltip": true + "tooltip": true, + "audited": true }, "lastRun": { "type": "datetime", diff --git a/application/Espo/Resources/metadata/entityDefs/User.json b/application/Espo/Resources/metadata/entityDefs/User.json index a29e7ac4c1..8b269425e8 100644 --- a/application/Espo/Resources/metadata/entityDefs/User.json +++ b/application/Espo/Resources/metadata/entityDefs/User.json @@ -112,7 +112,8 @@ "layoutDetailDisabled": true, "tooltip": true, "default": true, - "customizationAuditedDisabled": true + "customizationAuditedDisabled": true, + "audited": true }, "title": { "type": "varchar", @@ -315,23 +316,27 @@ "additionalAttributeList": ["columns"], "layoutDetailDisabled": true, "view": "views/user/fields/teams", - "default": "javascript: return {teamsIds: []}" + "default": "javascript: return {teamsIds: []}", + "audited": true }, "roles": { "type": "linkMultiple", "layoutDetailDisabled": true, - "tooltip": true + "tooltip": true, + "audited": true }, "portals": { "type": "linkMultiple", "layoutDetailDisabled": true, "layoutListDisabled": true, - "tooltip": true + "tooltip": true, + "audited": true }, "portalRoles": { "type": "linkMultiple", "layoutDetailDisabled": true, - "tooltip": true + "tooltip": true, + "audited": true }, "contact": { "type": "link", @@ -340,7 +345,8 @@ "fieldManagerParamList": [ "inlineEditDisabled", "tooltipText" - ] + ], + "audited": true }, "accounts": { "type": "linkMultiple", @@ -349,7 +355,8 @@ "fieldManagerParamList": [ "inlineEditDisabled", "tooltipText" - ] + ], + "audited": true }, "account": { "type": "link", @@ -358,7 +365,8 @@ "foreignAccessDisabled": true, "layoutDetailDisabled": true, "layoutListDisabled": true, - "readOnly": true + "readOnly": true, + "audited": true }, "portal": { "type": "link",