From 1c10ddd7b8350097090f1f8bf2ddde4b2dbfc1e4 Mon Sep 17 00:00:00 2001
From: Eymen Elkum <eymen.elkum@gmail.com>
Date: Thu, 4 Apr 2024 13:49:25 +0300
Subject: [PATCH 01/14] add missing & to google static url

---
 application/Espo/Classes/TemplateHelpers/GoogleMaps.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/Espo/Classes/TemplateHelpers/GoogleMaps.php b/application/Espo/Classes/TemplateHelpers/GoogleMaps.php
index b2aa1f6abe..7bf8c63a1b 100644
--- a/application/Espo/Classes/TemplateHelpers/GoogleMaps.php
+++ b/application/Espo/Classes/TemplateHelpers/GoogleMaps.php
@@ -165,7 +165,7 @@ class GoogleMaps implements Helper
 
         $url = "https://maps.googleapis.com/maps/api/staticmap?" .
             'center=' . $addressEncoded .
-            'format=' . $format .
+            '&format=' . $format .
             '&size=' . $size .
             '&key=' . $apiKey;
 

From a6c95ff0d501708b65329f8bb0e35dd80f79e3b2 Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Fri, 5 Apr 2024 09:37:10 +0300
Subject: [PATCH 02/14] layouts title

---
 client/res/templates/admin/layouts/grid-panel.tpl | 4 +++-
 client/res/templates/admin/layouts/grid.tpl       | 2 +-
 client/res/templates/admin/layouts/rows.tpl       | 8 +++++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/client/res/templates/admin/layouts/grid-panel.tpl b/client/res/templates/admin/layouts/grid-panel.tpl
index e15016a826..6cc27743b4 100644
--- a/client/res/templates/admin/layouts/grid-panel.tpl
+++ b/client/res/templates/admin/layouts/grid-panel.tpl
@@ -45,7 +45,9 @@
                 {{#if hasCustomLabel}}
                 data-custom-label="{{customLabel}}"
                 {{/if}}
-                data-no-label="{{noLabel}}" >
+                data-no-label="{{noLabel}}"
+                title="{{label}}"
+            >
                 <div class="left" style="width: calc(100% - 14px);">{{label}}</div>
                 <div class="right" style="width: 14px;">
                     <a
diff --git a/client/res/templates/admin/layouts/grid.tpl b/client/res/templates/admin/layouts/grid.tpl
index 5110f8e048..7ea70c71c5 100644
--- a/client/res/templates/admin/layouts/grid.tpl
+++ b/client/res/templates/admin/layouts/grid.tpl
@@ -26,7 +26,7 @@
             <header>{{translate 'Available Fields' scope='Admin'}}</header>
             <ul class="disabled cells clearfix">
                 {{#each disabledFields}}
-                <li class="cell" data-name="{{./this}}">
+                <li class="cell" data-name="{{./this}}" title="{{translate this scope=../scope category='fields'}}">
                     <div class="left" style="width: calc(100% - 14px);">
                         {{translate this scope=../scope category='fields'}}
                     </div>
diff --git a/client/res/templates/admin/layouts/rows.tpl b/client/res/templates/admin/layouts/rows.tpl
index 56269a328f..be292b12c9 100644
--- a/client/res/templates/admin/layouts/rows.tpl
+++ b/client/res/templates/admin/layouts/rows.tpl
@@ -12,7 +12,12 @@
             <header>{{translate 'Enabled' scope='Admin'}}</header>
             <ul class="enabled connected">
                 {{#each layout}}
-                    <li class="cell" draggable="true" {{#each ../dataAttributeList}}data-{{toDom this}}="{{prop ../this this}}" {{/each}}>
+                    <li
+                        class="cell"
+                        draggable="true"
+                        {{#each ../dataAttributeList}}data-{{toDom this}}="{{prop ../this this}}" {{/each}}
+                        title="{{labelText}}"
+                    >
                         <div class="left" style="width: calc(100% - 17px);">
                             <span>{{labelText}}</span>
                         </div>
@@ -40,6 +45,7 @@
                         class="cell"
                         draggable="true"
                         {{#each ../dataAttributeList}}data-{{toDom this}}="{{prop ../this this}}" {{/each}}
+                        title="{{labelText}}"
                     >
                         <div class="left" style="width: calc(100% - 17px);">
                             <span>{{labelText}}</span>

From 9395fa886e64bdeda35c2f34df3365f5fc4f9019 Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Fri, 5 Apr 2024 09:39:22 +0300
Subject: [PATCH 03/14] grid layout css fix

---
 client/css/misc/layout-manager-grid.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/css/misc/layout-manager-grid.css b/client/css/misc/layout-manager-grid.css
index cdc9ef69a3..15c54f2bf2 100644
--- a/client/css/misc/layout-manager-grid.css
+++ b/client/css/misc/layout-manager-grid.css
@@ -11,7 +11,7 @@
 
 #layout ul.panels > li {
     padding: 5px 10px;
-    margin-bottom: 20px;
+    margin-bottom: 14px;
     min-height: 80px;
     border: 1px solid var(--select-item-border);
     border-radius: var(--border-radius);

From 48b0063c6937cb4a3bc0b96e86f10953d31407b1 Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Fri, 5 Apr 2024 09:51:22 +0300
Subject: [PATCH 04/14] middle table prefix server side check

---
 application/Espo/Tools/LinkManager/LinkManager.php | 4 +++-
 client/src/views/admin/link-manager/modals/edit.js | 4 ----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/application/Espo/Tools/LinkManager/LinkManager.php b/application/Espo/Tools/LinkManager/LinkManager.php
index d185079634..8d8581bf48 100644
--- a/application/Espo/Tools/LinkManager/LinkManager.php
+++ b/application/Espo/Tools/LinkManager/LinkManager.php
@@ -126,7 +126,9 @@ class LinkManager
                 $params['relationName'] :
                 lcfirst($entity) . $entityForeign;
 
-            $relationName = $this->nameUtil->addCustomPrefix($relationName);
+            if ($relationName[0] !== 'c' || !preg_match('/[A-Z]/', $relationName[1])) {
+                $relationName = $this->nameUtil->addCustomPrefix($relationName);
+            }
 
             if ($this->isNameTooLong($relationName)) {
                 throw new Error("Relation name is too long.");
diff --git a/client/src/views/admin/link-manager/modals/edit.js b/client/src/views/admin/link-manager/modals/edit.js
index 9fe0375402..f75e02b5f1 100644
--- a/client/src/views/admin/link-manager/modals/edit.js
+++ b/client/src/views/admin/link-manager/modals/edit.js
@@ -665,10 +665,6 @@ class LinkManagerEditModalView extends ModalView {
                     Espo.Utils.lowerCaseFirst(this.scope) + entityForeign :
                     Espo.Utils.lowerCaseFirst(entityForeign) + this.scope;
 
-                if (relationName[0] !== 'c' || !/[A-Z]/.test(relationName[1])) {
-                    relationName = 'c' + Espo.Utils.upperCaseFirst(relationName);
-                }
-
                 this.model.set('relationName', relationName);
 
                 break;

From 1a51759b0f300db2fcfee264df8b4caecd617ec3 Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Fri, 5 Apr 2024 20:18:21 +0300
Subject: [PATCH 05/14] fix user acl

---
 client/src/acl/user.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/client/src/acl/user.js b/client/src/acl/user.js
index 94637eaa6a..65c5b8454e 100644
--- a/client/src/acl/user.js
+++ b/client/src/acl/user.js
@@ -32,11 +32,12 @@ class UserAcl extends Acl {
 
     // noinspection JSUnusedGlobalSymbols
     checkModelRead(model, data, precise) {
-        if (model.isPortal()) {
-            if (this.get('portalPermission') === 'yes') {
+        // @todo Support getPermissionLevel.
+        /*if (model.isPortal()) {
+            if (this.getPermissionLevel('portalPermission') === 'yes') {
                 return true;
             }
-        }
+        }*/
 
         return this.checkModel(model, data, 'read', precise);
     }

From 2ae0a118b61abb488f9fe3e7e0387bff32deb4f9 Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Fri, 5 Apr 2024 23:11:44 +0300
Subject: [PATCH 06/14] disable note in link manager

---
 .../views/admin/link-manager/modals/edit.js   | 28 +++++++++++++++++--
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/client/src/views/admin/link-manager/modals/edit.js b/client/src/views/admin/link-manager/modals/edit.js
index f75e02b5f1..aa0a091bcd 100644
--- a/client/src/views/admin/link-manager/modals/edit.js
+++ b/client/src/views/admin/link-manager/modals/edit.js
@@ -97,7 +97,19 @@ class LinkManagerEditModalView extends ModalView {
 
         const allEntityList = this.getMetadata().getScopeEntityList()
             .filter(item => {
-                return this.getMetadata().get(['scopes', item, 'customizable']);
+                const defs = /** @type {Record} */this.getMetadata().get(['scopes', item]) || {};
+
+                if (!defs.customizable) {
+                    return false;
+                }
+
+                const emDefs = /** @type {Record} */defs.entityManager || {};
+
+                if (emDefs.relationships === false) {
+                    return false;
+                }
+
+                return true;
             })
             .sort((v1, v2) => {
                 const t1 = this.translate(v1, 'scopeNames');
@@ -196,9 +208,19 @@ class LinkManagerEditModalView extends ModalView {
 
         const entityList = (Object.keys(scopes) || [])
             .filter(item => {
-                const d = scopes[item];
+                const defs = /** @type {Record} */scopes[item] || {};
 
-                return d.customizable && d.entity;
+                if (!defs.entity || !defs.customizable) {
+                    return false;
+                }
+
+                const emDefs = /** @type {Record} */defs.entityManager || {};
+
+                if (emDefs.relationships === false) {
+                    return false;
+                }
+
+                return true;
             })
             .sort((v1, v2) => {
                 const t1 = this.translate(v1, 'scopeNames');

From 14d8f8898544cc0f14b712265283e2ba060eecb0 Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Sat, 6 Apr 2024 09:32:17 +0300
Subject: [PATCH 07/14] ref

---
 client/src/views/fields/file.js        |  10 ++
 client/src/views/user/fields/avatar.js | 187 +++++++++++++------------
 2 files changed, 107 insertions(+), 90 deletions(-)

diff --git a/client/src/views/fields/file.js b/client/src/views/fields/file.js
index 4bcc1323e1..95fcb1df32 100644
--- a/client/src/views/fields/file.js
+++ b/client/src/views/fields/file.js
@@ -110,6 +110,7 @@ class FileFieldView extends LinkFieldView {
         },
     }
 
+    // noinspection JSCheckFunctionSignatures
     data() {
         const data = {
             ...super.data(),
@@ -123,6 +124,7 @@ class FileFieldView extends LinkFieldView {
 
         data.valueIsSet = this.model.has(this.idName);
 
+        // noinspection JSValidateTypes
         return data;
     }
 
@@ -523,6 +525,9 @@ class FileFieldView extends LinkFieldView {
         return maxFileSize;
     }
 
+    /**
+     * @param {File} file
+     */
     uploadFile(file) {
         let isCanceled = false;
 
@@ -627,6 +632,11 @@ class FileFieldView extends LinkFieldView {
         });
     }
 
+    /**
+     * @protected
+     * @param {File} file
+     * @return {Promise<unknown>}
+     */
     handleUploadingFile(file) {
         return new Promise(resolve => resolve(file));
     }
diff --git a/client/src/views/user/fields/avatar.js b/client/src/views/user/fields/avatar.js
index 672524f0c0..82cd9e26f7 100644
--- a/client/src/views/user/fields/avatar.js
+++ b/client/src/views/user/fields/avatar.js
@@ -26,113 +26,120 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-define('views/user/fields/avatar', ['views/fields/image'], function (Dep) {
+import ImageFieldView from 'views/fields/image';
 
-    return Dep.extend({
+class UserAvatarFieldView extends ImageFieldView {
 
-        setup: function () {
-            Dep.prototype.setup.call(this);
+    setup() {
+        super.setup();
 
-            this.on('after:inline-save', () => {
-                this.suspendCache = true;
+        this.on('after:inline-save', () => {
+            this.suspendCache = true;
 
-                this.reRender();
-            });
-        },
+            this.reRender();
+        });
+    }
 
-        handleUploadingFile: function (file) {
-            return new Promise((resolve, reject) => {
-                let fileReader = new FileReader();
+    /**
+     * @protected
+     * @param {File} file
+     * @return {Promise<unknown>}
+     */
+    handleUploadingFile(file) {
+        return new Promise((resolve, reject) => {
+            const fileReader = new FileReader();
 
-                fileReader.onload = (e) => {
-                    this.createView('crop', 'views/modals/image-crop', {contents: e.target.result})
-                        .then(view => {
-                            view.render();
+            fileReader.onload = (e) => {
+                this.createView('crop', 'views/modals/image-crop', {contents: e.target.result})
+                    .then(view => {
+                        view.render();
 
-                            let cropped = false;
+                        let cropped = false;
 
-                            this.listenToOnce(view, 'crop', (dataUrl) => {
-                                cropped = true;
+                        this.listenToOnce(view, 'crop', dataUrl => {
+                            cropped = true;
 
-                                setTimeout(() => {
-                                    fetch(dataUrl)
-                                        .then(result => result.blob())
-                                        .then(blob => {
-                                            resolve(
-                                                new File([blob], 'avatar.jpg', {type: 'image/jpeg'})
-                                            );
-                                        });
-                                }, 10);
-                            });
-
-                            this.listenToOnce(view, 'remove', () => {
-                                if (!cropped) {
-                                    setTimeout(() => this.render(), 10);
-
-                                    reject();
-                                }
-
-                                this.clearView('crop');
-                            });
+                            setTimeout(() => {
+                                fetch(dataUrl)
+                                    .then(result => result.blob())
+                                    .then(blob => {
+                                        resolve(
+                                            new File([blob], 'avatar.jpg', {type: 'image/jpeg'})
+                                        );
+                                    });
+                            }, 10);
                         });
-                };
 
-                fileReader.readAsDataURL(file);
+                        this.listenToOnce(view, 'remove', () => {
+                            if (!cropped) {
+                                setTimeout(() => this.render(), 10);
+
+                                reject();
+                            }
+
+                            this.clearView('crop');
+                        });
+                    });
+            };
+
+            fileReader.readAsDataURL(file);
+        });
+    }
+
+    getValueForDisplay() {
+        if (!this.isReadMode()) {
+            return '';
+        }
+
+        const id = this.model.get(this.idName);
+        const userId = this.model.id;
+
+        let t = this.cacheTimestamp = this.cacheTimestamp || Date.now();
+
+        if (this.suspendCache) {
+            t = Date.now();
+        }
+
+        const src = this.getBasePath() +
+            '?entryPoint=avatar&size=' + this.previewSize + '&id=' + userId +
+            '&t=' + t + '&attachmentId=' + (id || 'false');
+
+        // noinspection HtmlRequiredAltAttribute,RequiredAttributes
+        const $img = $('<img>')
+            .attr('src', src)
+            .attr('alt', this.labelText)
+            .css({
+                maxWidth: (this.imageSizes[this.previewSize] || {})[0],
+                maxHeight: (this.imageSizes[this.previewSize] || {})[1],
             });
-        },
 
-        getValueForDisplay: function () {
-            if (!this.isReadMode()) {
-                return '';
+        if (!this.isDetailMode()) {
+            if (this.getCache()) {
+                t = this.getCache().get('app', 'timestamp');
             }
 
-            let id = this.model.get(this.idName);
-            let userId = this.model.id;
+            const src = `${this.getBasePath()}?entryPoint=avatar&size=${this.previewSize}&id=${userId}&t=${t}`;
 
-            let t = this.cacheTimestamp = this.cacheTimestamp || Date.now();
-
-            if (this.suspendCache) {
-                t = Date.now();
-            }
-
-            let src = this.getBasePath() +
-                '?entryPoint=avatar&size=' + this.previewSize + '&id=' + userId +
-                '&t=' + t + '&attachmentId=' + (id || 'false');
-
-            let $img = $('<img>')
+            $img
+                .attr('width', '16')
                 .attr('src', src)
-                .css({
-                    maxWidth: (this.imageSizes[this.previewSize] || {})[0],
-                    maxHeight: (this.imageSizes[this.previewSize] || {})[1],
-                });
+                .css('maxWidth', '16px');
+        }
 
-            if (!this.isDetailMode()) {
-                if (this.getCache()) {
-                    t = this.getCache().get('app', 'timestamp');
-                }
-
-                let src = this.getBasePath() + '?entryPoint=avatar&size=' +
-                    this.previewSize + '&id=' + userId + '&t=' + t;
-
-                $img
-                    .attr('width', '16')
-                    .attr('src', src)
-                    .css('maxWidth', '16px');
-            }
-
-            if (!id) {
-                return $img
-                    .get(0)
-                    .outerHTML;
-            }
-
-            return $('<a>')
-                .attr('data-id', id)
-                .attr('data-action', 'showImagePreview')
-                .attr('href', this.getBasePath() + '?entryPoint=image&id=' + id)
-                .append($img)
+        if (!id) {
+            return $img
                 .get(0)
                 .outerHTML;
-        },
-    });
-});
+        }
+
+        return $('<a>')
+            .attr('data-id', id)
+            .attr('data-action', 'showImagePreview')
+            .attr('href', this.getBasePath() + '?entryPoint=image&id=' + id)
+            .append($img)
+            .get(0)
+            .outerHTML;
+    }
+}
+
+export default UserAvatarFieldView;

From 35f8c5652ae25e982b78e16c1017ca3ed349591c Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Sat, 6 Apr 2024 09:35:25 +0300
Subject: [PATCH 08/14] avater flicker fix

---
 client/src/views/user/fields/avatar.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/client/src/views/user/fields/avatar.js b/client/src/views/user/fields/avatar.js
index 82cd9e26f7..fd1a80a0de 100644
--- a/client/src/views/user/fields/avatar.js
+++ b/client/src/views/user/fields/avatar.js
@@ -30,6 +30,14 @@ import ImageFieldView from 'views/fields/image';
 
 class UserAvatarFieldView extends ImageFieldView {
 
+    getAttributeList() {
+        if (this.isEditMode()) {
+            return super.getAttributeList();
+        }
+
+        return [];
+    }
+
     setup() {
         super.setup();
 

From 078808604c9ada971b7364ae4d9d26396640fadc Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Sat, 6 Apr 2024 09:38:39 +0300
Subject: [PATCH 09/14] ref

---
 client/src/views/user/record/edit.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/src/views/user/record/edit.js b/client/src/views/user/record/edit.js
index 4b4b3602c3..2746368806 100644
--- a/client/src/views/user/record/edit.js
+++ b/client/src/views/user/record/edit.js
@@ -128,7 +128,7 @@ class UserEditRecordView extends EditRecordView {
     }
 
     controlSendAccessInfoFieldForNew() {
-        let skipSettingTrue = this.recordHelper.getFieldStateParam('sendAccessInfo', 'hidden') === false;
+        const skipSettingTrue = this.recordHelper.getFieldStateParam('sendAccessInfo', 'hidden') === false;
 
         if (this.isPasswordSendable()) {
             this.showField('sendAccessInfo');
@@ -173,7 +173,7 @@ class UserEditRecordView extends EditRecordView {
     getGridLayout(callback) {
         this.getHelper().layoutManager
             .get(this.model.entityType, this.options.layoutName || this.layoutName, simpleLayout => {
-                let layout = Espo.Utils.cloneDeep(simpleLayout);
+                const layout = Espo.Utils.cloneDeep(simpleLayout);
 
                 layout.push({
                     "label": "Teams and Access Control",
@@ -279,7 +279,7 @@ class UserEditRecordView extends EditRecordView {
                     });
                 }
 
-                let gridLayout = {
+                const gridLayout = {
                     type: 'record',
                     layout: this.convertDetailLayout(layout),
                 };
@@ -302,7 +302,7 @@ class UserEditRecordView extends EditRecordView {
     }
 
     fetch() {
-        let data = super.fetch();
+        const data = super.fetch();
 
         if (!this.isNew) {
             if (

From 831dfc5bfd3401258b0113ef2bd2b7d308e14240 Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Sat, 6 Apr 2024 09:51:48 +0300
Subject: [PATCH 10/14] fix sndAccessInfo fetch

---
 client/src/views/user/record/edit.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/client/src/views/user/record/edit.js b/client/src/views/user/record/edit.js
index 2746368806..1bd9eb025c 100644
--- a/client/src/views/user/record/edit.js
+++ b/client/src/views/user/record/edit.js
@@ -124,6 +124,10 @@ class UserEditRecordView extends EditRecordView {
 
         this.hideField('sendAccessInfo');
 
+        if (!this.model.has('sendAccessInfo')) {
+            return;
+        }
+
         this.model.set('sendAccessInfo', false);
     }
 

From d5930542d9a1e88d39c8d6d666e81306f99a17d3 Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Sat, 6 Apr 2024 09:51:56 +0300
Subject: [PATCH 11/14] ref

---
 .../views/user/fields/generate-password.js    |  54 +++--
 client/src/views/user/fields/password.js      | 229 ++++++++++--------
 2 files changed, 162 insertions(+), 121 deletions(-)

diff --git a/client/src/views/user/fields/generate-password.js b/client/src/views/user/fields/generate-password.js
index b8e990b1c1..dc5da948b0 100644
--- a/client/src/views/user/fields/generate-password.js
+++ b/client/src/views/user/fields/generate-password.js
@@ -78,23 +78,31 @@ define('views/user/fields/generate-password', ['views/fields/base'], function (D
         },
 
         actionGeneratePassword: function () {
-            var length = this.passwordStrengthLength;
-            var letterCount = this.passwordStrengthLetterCount;
-            var numberCount = this.passwordStrengthNumberCount;
+            let length = this.passwordStrengthLength;
+            let letterCount = this.passwordStrengthLetterCount;
+            let numberCount = this.passwordStrengthNumberCount;
 
-            var generateLength = this.passwordGenerateLength || 10;
-            var generateLetterCount = this.passwordGenerateLetterCount || 4;
-            var generateNumberCount = this.passwordGenerateNumberCount || 2;
+            const generateLength = this.passwordGenerateLength || 10;
+            const generateLetterCount = this.passwordGenerateLetterCount || 4;
+            const generateNumberCount = this.passwordGenerateNumberCount || 2;
 
             length = (typeof length === 'undefined') ? generateLength : length;
             letterCount = (typeof letterCount === 'undefined') ? generateLetterCount : letterCount;
             numberCount = (typeof numberCount === 'undefined') ? generateNumberCount : numberCount;
 
-            if (length < generateLength) length = generateLength;
-            if (letterCount < generateLetterCount) letterCount = generateLetterCount;
-            if (numberCount < generateNumberCount) numberCount = generateNumberCount;
+            if (length < generateLength) {
+                length = generateLength;
+            }
 
-            var password = this.generatePassword(length, letterCount, numberCount, true);
+            if (letterCount < generateLetterCount) {
+                letterCount = generateLetterCount;
+            }
+
+            if (numberCount < generateNumberCount) {
+                numberCount = generateNumberCount;
+            }
+
+            const password = this.generatePassword(length, letterCount, numberCount, true);
 
             this.model.set({
                 password: password,
@@ -104,7 +112,7 @@ define('views/user/fields/generate-password', ['views/fields/base'], function (D
         },
 
         generatePassword: function (length, letters, numbers, bothCases) {
-            var chars = [
+            const chars = [
                 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz',
                 '0123456789',
                 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789',
@@ -112,8 +120,8 @@ define('views/user/fields/generate-password', ['views/fields/base'], function (D
                 'abcdefghijklmnopqrstuvwxyz',
             ];
 
-            var upperCase = 0;
-            var lowerCase = 0;
+            let upperCase = 0;
+            let lowerCase = 0;
 
             if (bothCases) {
                 upperCase = 1;
@@ -126,16 +134,16 @@ define('views/user/fields/generate-password', ['views/fields/base'], function (D
                 }
             }
 
-            var either = length - (letters + numbers + upperCase + lowerCase);
+            let either = length - (letters + numbers + upperCase + lowerCase);
 
             if (either < 0) {
                 either = 0;
             }
 
-            var setList = [letters, numbers, either, upperCase, lowerCase];
+            const setList = [letters, numbers, either, upperCase, lowerCase];
 
-            var shuffle = function (array) {
-                var currentIndex = array.length, temporaryValue, randomIndex;
+            const shuffle = function (array) {
+                let currentIndex = array.length, temporaryValue, randomIndex;
 
                 while (0 !== currentIndex) {
                     randomIndex = Math.floor(Math.random() * currentIndex);
@@ -148,14 +156,10 @@ define('views/user/fields/generate-password', ['views/fields/base'], function (D
                 return array;
             };
 
-            var array = setList.map(
-                function (len, i) {
-                    return Array(len).fill(chars[i]).map(
-                        function (x) {
-                            return x[Math.floor(Math.random() * x.length)];
-                        }
-                    ).join('');
-                }
+            const array = setList.map(
+                (len, i) => Array(len).fill(chars[i]).map(
+                    x => x[Math.floor(Math.random() * x.length)]
+                ).join('')
             ).concat();
 
             return shuffle(array).join('');
diff --git a/client/src/views/user/fields/password.js b/client/src/views/user/fields/password.js
index 51d7a6baef..20e8bd7f0a 100644
--- a/client/src/views/user/fields/password.js
+++ b/client/src/views/user/fields/password.js
@@ -26,122 +26,159 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-define('views/user/fields/password', ['views/fields/password'], function (Dep) {
+import PasswordFieldView from 'views/fields/password';
 
-    return Dep.extend({
+class UserPasswordFieldView extends PasswordFieldView {
 
-        validations: ['required', 'strength', 'confirm'],
+    validations = [
+        'required',
+        'strength',
+        'confirm',
+    ]
 
-        setup: function () {
-            Dep.prototype.setup.call(this);
-        },
+    init() {
+        const tooltipItemList = [];
 
-        init: function () {
-            var tooltipItemList = [];
+        this.strengthParams = this.options.strengthParams || {
+            passwordStrengthLength: this.getConfig().get('passwordStrengthLength'),
+            passwordStrengthLetterCount: this.getConfig().get('passwordStrengthLetterCount'),
+            passwordStrengthNumberCount: this.getConfig().get('passwordStrengthNumberCount'),
+            passwordStrengthBothCases: this.getConfig().get('passwordStrengthBothCases'),
+        };
 
-            this.strengthParams = this.options.strengthParams || {
-                passwordStrengthLength: this.getConfig().get('passwordStrengthLength'),
-                passwordStrengthLetterCount: this.getConfig().get('passwordStrengthLetterCount'),
-                passwordStrengthNumberCount: this.getConfig().get('passwordStrengthNumberCount'),
-                passwordStrengthBothCases: this.getConfig().get('passwordStrengthBothCases'),
-            };
+        const minLength = this.strengthParams.passwordStrengthLength;
 
-            var minLength = this.strengthParams.passwordStrengthLength;
-            if (minLength) {
-                tooltipItemList.push(
-                    '* ' + this.translate('passwordStrengthLength', 'messages', 'User').replace('{length}', minLength.toString())
-                );
+        if (minLength) {
+            tooltipItemList.push(
+                '* ' + this.translate('passwordStrengthLength', 'messages', 'User')
+                    .replace('{length}', minLength.toString())
+            );
+        }
+
+        const requiredLetterCount = this.strengthParams.passwordStrengthLetterCount;
+
+        if (requiredLetterCount) {
+            tooltipItemList.push(
+                '* ' + this.translate('passwordStrengthLetterCount', 'messages', 'User')
+                    .replace('{count}', requiredLetterCount.toString())
+            );
+        }
+
+        const requiredNumberCount = this.strengthParams.passwordStrengthNumberCount;
+
+        if (requiredNumberCount) {
+            tooltipItemList.push(
+                '* ' + this.translate('passwordStrengthNumberCount', 'messages', 'User')
+                    .replace('{count}', requiredNumberCount.toString())
+            );
+        }
+
+        const bothCases = this.strengthParams.passwordStrengthBothCases;
+
+        if (bothCases) {
+            tooltipItemList.push(
+                '* ' + this.translate('passwordStrengthBothCases', 'messages', 'User')
+            );
+        }
+
+        if (tooltipItemList.length) {
+            this.tooltip = true;
+            this.tooltipText = this.translate('Requirements', 'labels', 'User') + ':\n' + tooltipItemList.join('\n');
+        }
+
+        super.init();
+    }
+
+    // noinspection JSUnusedGlobalSymbols
+    validateStrength() {
+        if (!this.model.get(this.name)) {
+            return;
+        }
+
+        const password = this.model.get(this.name);
+        const minLength = this.strengthParams.passwordStrengthLength;
+
+        if (minLength) {
+            if (password.length < minLength) {
+                const msg = this.translate('passwordStrengthLength', 'messages', 'User')
+                    .replace('{length}', minLength.toString());
+
+                this.showValidationMessage(msg);
+
+                return true;
             }
+        }
 
-            var requiredLetterCount = this.strengthParams.passwordStrengthLetterCount;
-            if (requiredLetterCount) {
-                tooltipItemList.push(
-                    '* ' + this.translate('passwordStrengthLetterCount', 'messages', 'User').replace('{count}', requiredLetterCount.toString())
-                );
-            }
+        const requiredLetterCount = this.strengthParams.passwordStrengthLetterCount;
 
-            var requiredNumberCount = this.strengthParams.passwordStrengthNumberCount;
-            if (requiredNumberCount) {
-                tooltipItemList.push(
-                    '* ' + this.translate('passwordStrengthNumberCount', 'messages', 'User').replace('{count}', requiredNumberCount.toString())
-                );
-            }
+        if (requiredLetterCount) {
+            let letterCount = 0;
 
-            var bothCases = this.strengthParams.passwordStrengthBothCases;
-            if (bothCases) {
-                tooltipItemList.push(
-                    '* ' + this.translate('passwordStrengthBothCases', 'messages', 'User')
-                );
-            }
-
-            if (tooltipItemList.length) {
-                this.tooltip = true;
-                this.tooltipText = this.translate('Requirements', 'labels', 'User') + ':\n' + tooltipItemList.join('\n');
-            }
-
-            Dep.prototype.init.call(this);
-        },
-
-        validateStrength: function () {
-            if (!this.model.get(this.name)) return;
-
-            var password = this.model.get(this.name);
-
-            var minLength = this.strengthParams.passwordStrengthLength;
-            if (minLength) {
-                if (password.length < minLength) {
-                    var msg = this.translate('passwordStrengthLength', 'messages', 'User').replace('{length}', minLength.toString());
-                    this.showValidationMessage(msg);
-                    return true;;
+            password.split('').forEach(c => {
+                if (c.toLowerCase() !== c.toUpperCase()) {
+                    letterCount++;
                 }
+            });
+
+            if (letterCount < requiredLetterCount) {
+                const msg = this.translate('passwordStrengthLetterCount', 'messages', 'User')
+                    .replace('{count}', requiredLetterCount.toString());
+
+                this.showValidationMessage(msg);
+
+                return true;
             }
+        }
 
-            var requiredLetterCount = this.strengthParams.passwordStrengthLetterCount;
-            if (requiredLetterCount) {
-                var letterCount = 0;
-                password.split('').forEach(function (c) {
-                    if (c.toLowerCase() !== c.toUpperCase()) letterCount++;
-                }, this);
+        const requiredNumberCount = this.strengthParams.passwordStrengthNumberCount;
 
-                if (letterCount < requiredLetterCount) {
-                    var msg = this.translate('passwordStrengthLetterCount', 'messages', 'User').replace('{count}', requiredLetterCount.toString());
-                    this.showValidationMessage(msg);
-                    return true;;
+        if (requiredNumberCount) {
+            let numberCount = 0;
+
+            password.split('').forEach((c) => {
+                if (c >= '0' && c <= '9') {
+                    numberCount++;
                 }
+            });
+
+            if (numberCount < requiredNumberCount) {
+                const msg = this.translate('passwordStrengthNumberCount', 'messages', 'User')
+                    .replace('{count}', requiredNumberCount.toString());
+
+                this.showValidationMessage(msg);
+
+                return true;
             }
+        }
 
-            var requiredNumberCount = this.strengthParams.passwordStrengthNumberCount;
-            if (requiredNumberCount) {
-                var numberCount = 0;
-                password.split('').forEach(function (c) {
-                    if (c >= '0' && c <= '9') numberCount++;
-                }, this);
+        const bothCases = this.strengthParams.passwordStrengthBothCases;
 
-                if (numberCount < requiredNumberCount) {
-                    var msg = this.translate('passwordStrengthNumberCount', 'messages', 'User').replace('{count}', requiredNumberCount.toString());
-                    this.showValidationMessage(msg);
-                    return true;;
+        if (bothCases) {
+            let ucCount = 0;
+
+            password.split('').forEach((c) => {
+                if (c.toLowerCase() !== c.toUpperCase() && c === c.toUpperCase()) {
+                    ucCount++;
                 }
-            }
+            });
 
-            var bothCases = this.strengthParams.passwordStrengthBothCases;
-            if (bothCases) {
-                var ucCount = 0;
-                password.split('').forEach(function (c) {
-                    if (c.toLowerCase() !== c.toUpperCase() && c === c.toUpperCase()) ucCount++;
-                }, this);
-                var lcCount = 0;
-                password.split('').forEach(function (c) {
-                    if (c.toLowerCase() !== c.toUpperCase() && c === c.toLowerCase()) lcCount++;
-                }, this);
+            let lcCount = 0;
 
-                if (!ucCount || !lcCount) {
-                    var msg = this.translate('passwordStrengthBothCases', 'messages', 'User');
-                    this.showValidationMessage(msg);
-                    return true;
+            password.split('').forEach(c => {
+                if (c.toLowerCase() !== c.toUpperCase() && c === c.toLowerCase()) {
+                    lcCount++;
                 }
-            }
-        },
+            });
 
-    });
-});
+            if (!ucCount || !lcCount) {
+                const msg = this.translate('passwordStrengthBothCases', 'messages', 'User');
+
+                this.showValidationMessage(msg);
+
+                return true;
+            }
+        }
+    }
+}
+
+export default UserPasswordFieldView;

From 0b035b89c062c11f21ccc291ac5261ae2d5c1ef7 Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Sat, 6 Apr 2024 09:55:56 +0300
Subject: [PATCH 12/14] user fetch issue

---
 client/src/views/user/fields/generate-password.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/client/src/views/user/fields/generate-password.js b/client/src/views/user/fields/generate-password.js
index dc5da948b0..484c548940 100644
--- a/client/src/views/user/fields/generate-password.js
+++ b/client/src/views/user/fields/generate-password.js
@@ -47,9 +47,13 @@ define('views/user/fields/generate-password', ['views/fields/base'], function (D
                     return;
                 }
 
-                this.model.set({
-                    passwordPreview: '',
-                });
+                if (value !== undefined) {
+                    this.model.set('passwordPreview', null);
+
+                    return;
+                }
+
+                this.model.unset('passwordPreview');
             });
 
             this.strengthParams = this.options.strengthParams || {};

From 813368228891425346afdc44cc2ae29ffd960fa7 Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Sat, 6 Apr 2024 09:58:48 +0300
Subject: [PATCH 13/14] ref

---
 .../views/user/fields/generate-password.js    | 265 +++++++++---------
 1 file changed, 135 insertions(+), 130 deletions(-)

diff --git a/client/src/views/user/fields/generate-password.js b/client/src/views/user/fields/generate-password.js
index 484c548940..13ef5a05ea 100644
--- a/client/src/views/user/fields/generate-password.js
+++ b/client/src/views/user/fields/generate-password.js
@@ -26,148 +26,153 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-define('views/user/fields/generate-password', ['views/fields/base'], function (Dep) {
+import BaseFieldView from 'views/fields/base';
 
-    return Dep.extend({
+class UserGeneratePasswordFieldView extends BaseFieldView {
 
-        templateContent: '<button type="button" class="btn btn-default" data-action="generatePassword">' +
-            '{{translate \'Generate\' scope=\'User\'}}</button>',
+    templateContent = `
+        <button
+            type="button"
+            class="btn btn-default"
+            data-action="generatePassword"
+        >{{translate 'Generate' scope='User'}}</button>`
 
-        events: {
-            'click [data-action="generatePassword"]': function () {
-                this.actionGeneratePassword();
-            },
+    events = {
+        /** @this {UserGeneratePasswordFieldView} */
+        'click [data-action="generatePassword"]': function () {
+            this.actionGeneratePassword();
         },
+    }
 
-        setup: function () {
-            Dep.prototype.setup.call(this);
+    setup() {
+        super.setup();
 
-            this.listenTo(this.model, 'change:password', (model, value, o) => {
-                if (o.isGenerated) {
-                    return;
-                }
-
-                if (value !== undefined) {
-                    this.model.set('passwordPreview', null);
-
-                    return;
-                }
-
-                this.model.unset('passwordPreview');
-            });
-
-            this.strengthParams = this.options.strengthParams || {};
-
-            this.passwordStrengthLength = this.strengthParams.passwordStrengthLength ||
-                this.getConfig().get('passwordStrengthLength');
-
-            this.passwordStrengthLetterCount = this.strengthParams.passwordStrengthLetterCount ||
-                this.getConfig().get('passwordStrengthLetterCount');
-
-            this.passwordStrengthNumberCount = this.strengthParams.passwordStrengthNumberCount ||
-                this.getConfig().get('passwordStrengthNumberCount');
-
-            this.passwordGenerateLength = this.strengthParams.passwordGenerateLength ||
-                this.getConfig().get('passwordGenerateLength');
-
-            this.passwordGenerateLetterCount = this.strengthParams.passwordGenerateLetterCount ||
-                this.getConfig().get('passwordGenerateLetterCount');
-
-            this.passwordGenerateNumberCount = this.strengthParams.passwordGenerateNumberCount ||
-                this.getConfig().get('passwordGenerateNumberCount');
-        },
-
-        fetch: function () {
-            return {};
-        },
-
-        actionGeneratePassword: function () {
-            let length = this.passwordStrengthLength;
-            let letterCount = this.passwordStrengthLetterCount;
-            let numberCount = this.passwordStrengthNumberCount;
-
-            const generateLength = this.passwordGenerateLength || 10;
-            const generateLetterCount = this.passwordGenerateLetterCount || 4;
-            const generateNumberCount = this.passwordGenerateNumberCount || 2;
-
-            length = (typeof length === 'undefined') ? generateLength : length;
-            letterCount = (typeof letterCount === 'undefined') ? generateLetterCount : letterCount;
-            numberCount = (typeof numberCount === 'undefined') ? generateNumberCount : numberCount;
-
-            if (length < generateLength) {
-                length = generateLength;
+        this.listenTo(this.model, 'change:password', (model, value, o) => {
+            if (o.isGenerated) {
+                return;
             }
 
-            if (letterCount < generateLetterCount) {
-                letterCount = generateLetterCount;
+            if (value !== undefined) {
+                this.model.set('passwordPreview', null);
+
+                return;
             }
 
-            if (numberCount < generateNumberCount) {
-                numberCount = generateNumberCount;
+            this.model.unset('passwordPreview');
+        });
+
+        this.strengthParams = this.options.strengthParams || {};
+
+        this.passwordStrengthLength = this.strengthParams.passwordStrengthLength ||
+            this.getConfig().get('passwordStrengthLength');
+
+        this.passwordStrengthLetterCount = this.strengthParams.passwordStrengthLetterCount ||
+            this.getConfig().get('passwordStrengthLetterCount');
+
+        this.passwordStrengthNumberCount = this.strengthParams.passwordStrengthNumberCount ||
+            this.getConfig().get('passwordStrengthNumberCount');
+
+        this.passwordGenerateLength = this.strengthParams.passwordGenerateLength ||
+            this.getConfig().get('passwordGenerateLength');
+
+        this.passwordGenerateLetterCount = this.strengthParams.passwordGenerateLetterCount ||
+            this.getConfig().get('passwordGenerateLetterCount');
+
+        this.passwordGenerateNumberCount = this.strengthParams.passwordGenerateNumberCount ||
+            this.getConfig().get('passwordGenerateNumberCount');
+    }
+
+    fetch() {
+        return {};
+    }
+
+    actionGeneratePassword() {
+        let length = this.passwordStrengthLength;
+        let letterCount = this.passwordStrengthLetterCount;
+        let numberCount = this.passwordStrengthNumberCount;
+
+        const generateLength = this.passwordGenerateLength || 10;
+        const generateLetterCount = this.passwordGenerateLetterCount || 4;
+        const generateNumberCount = this.passwordGenerateNumberCount || 2;
+
+        length = (typeof length === 'undefined') ? generateLength : length;
+        letterCount = (typeof letterCount === 'undefined') ? generateLetterCount : letterCount;
+        numberCount = (typeof numberCount === 'undefined') ? generateNumberCount : numberCount;
+
+        if (length < generateLength) {
+            length = generateLength;
+        }
+
+        if (letterCount < generateLetterCount) {
+            letterCount = generateLetterCount;
+        }
+
+        if (numberCount < generateNumberCount) {
+            numberCount = generateNumberCount;
+        }
+
+        const password = this.generatePassword(length, letterCount, numberCount, true);
+
+        this.model.set({
+            password: password,
+            passwordConfirm: password,
+            passwordPreview: password,
+        }, {isGenerated: true});
+    }
+
+    generatePassword(length, letters, numbers, bothCases) {
+        const chars = [
+            'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz',
+            '0123456789',
+            'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789',
+            'ABCDEFGHIJKLMNOPQRSTUVWXYZ',
+            'abcdefghijklmnopqrstuvwxyz',
+        ];
+
+        let upperCase = 0;
+        let lowerCase = 0;
+
+        if (bothCases) {
+            upperCase = 1;
+            lowerCase = 1;
+
+            if (letters >= 2) {
+                letters = letters - 2;
+            } else {
+                letters = 0;
+            }
+        }
+
+        let either = length - (letters + numbers + upperCase + lowerCase);
+
+        if (either < 0) {
+            either = 0;
+        }
+
+        const setList = [letters, numbers, either, upperCase, lowerCase];
+
+        const shuffle = function (array) {
+            let currentIndex = array.length, temporaryValue, randomIndex;
+
+            while (0 !== currentIndex) {
+                randomIndex = Math.floor(Math.random() * currentIndex);
+                currentIndex -= 1;
+                temporaryValue = array[currentIndex];
+                array[currentIndex] = array[randomIndex];
+                array[randomIndex] = temporaryValue;
             }
 
-            const password = this.generatePassword(length, letterCount, numberCount, true);
+            return array;
+        };
 
-            this.model.set({
-                password: password,
-                passwordConfirm: password,
-                passwordPreview: password,
-            }, {isGenerated: true});
-        },
+        const array = setList.map(
+            (len, i) => Array(len).fill(chars[i]).map(
+                x => x[Math.floor(Math.random() * x.length)]
+            ).join('')
+        ).concat();
 
-        generatePassword: function (length, letters, numbers, bothCases) {
-            const chars = [
-                'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz',
-                '0123456789',
-                'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789',
-                'ABCDEFGHIJKLMNOPQRSTUVWXYZ',
-                'abcdefghijklmnopqrstuvwxyz',
-            ];
+        return shuffle(array).join('');
+    }
+}
 
-            let upperCase = 0;
-            let lowerCase = 0;
-
-            if (bothCases) {
-                upperCase = 1;
-                lowerCase = 1;
-
-                if (letters >= 2) {
-                    letters = letters - 2;
-                } else {
-                    letters = 0;
-                }
-            }
-
-            let either = length - (letters + numbers + upperCase + lowerCase);
-
-            if (either < 0) {
-                either = 0;
-            }
-
-            const setList = [letters, numbers, either, upperCase, lowerCase];
-
-            const shuffle = function (array) {
-                let currentIndex = array.length, temporaryValue, randomIndex;
-
-                while (0 !== currentIndex) {
-                    randomIndex = Math.floor(Math.random() * currentIndex);
-                    currentIndex -= 1;
-                    temporaryValue = array[currentIndex];
-                    array[currentIndex] = array[randomIndex];
-                    array[randomIndex] = temporaryValue;
-                }
-
-                return array;
-            };
-
-            const array = setList.map(
-                (len, i) => Array(len).fill(chars[i]).map(
-                    x => x[Math.floor(Math.random() * x.length)]
-                ).join('')
-            ).concat();
-
-            return shuffle(array).join('');
-        },
-
-    });
-});
+export default UserGeneratePasswordFieldView;

From dca1d34685d62c8913b5a42a76c116f68eea51c5 Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Sun, 7 Apr 2024 18:30:55 +0300
Subject: [PATCH 14/14] reminder usersColumns check

---
 .../Espo/Modules/Crm/Business/Reminder/EmailReminder.php     | 5 ++++-
 application/Espo/Modules/Crm/Jobs/SubmitPopupReminders.php   | 3 ++-
 .../Crm/Tools/Activities/PopupNotificationsProvider.php      | 3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/application/Espo/Modules/Crm/Business/Reminder/EmailReminder.php b/application/Espo/Modules/Crm/Business/Reminder/EmailReminder.php
index da04a48ff8..904a802b9b 100644
--- a/application/Espo/Modules/Crm/Business/Reminder/EmailReminder.php
+++ b/application/Espo/Modules/Crm/Business/Reminder/EmailReminder.php
@@ -106,7 +106,10 @@ class EmailReminder
             return;
         }
 
-        if ($entity->hasLinkMultipleField('users')) {
+        if (
+            $entity->hasLinkMultipleField('users') &&
+            $entity->hasAttribute('usersColumns')
+        ) {
             $entity->loadLinkMultipleField('users', ['status' => 'acceptanceStatus']);
             $status = $entity->getLinkMultipleColumn('users', 'status', $user->getId());
 
diff --git a/application/Espo/Modules/Crm/Jobs/SubmitPopupReminders.php b/application/Espo/Modules/Crm/Jobs/SubmitPopupReminders.php
index c78812e857..49beda5e8f 100644
--- a/application/Espo/Modules/Crm/Jobs/SubmitPopupReminders.php
+++ b/application/Espo/Modules/Crm/Jobs/SubmitPopupReminders.php
@@ -106,7 +106,8 @@ class SubmitPopupReminders implements JobDataLess
 
             if (
                 $entity instanceof CoreEntity &&
-                $entity->hasLinkMultipleField('users')
+                $entity->hasLinkMultipleField('users') &&
+                $entity->hasAttribute('usersColumns')
             ) {
                 $entity->loadLinkMultipleField('users', ['status' => 'acceptanceStatus']);
 
diff --git a/application/Espo/Modules/Crm/Tools/Activities/PopupNotificationsProvider.php b/application/Espo/Modules/Crm/Tools/Activities/PopupNotificationsProvider.php
index d1bd1a2941..e63a3c8859 100644
--- a/application/Espo/Modules/Crm/Tools/Activities/PopupNotificationsProvider.php
+++ b/application/Espo/Modules/Crm/Tools/Activities/PopupNotificationsProvider.php
@@ -113,7 +113,8 @@ class PopupNotificationsProvider implements Provider
 
             if (
                 $entity instanceof CoreEntity &&
-                $entity->hasLinkMultipleField('users')
+                $entity->hasLinkMultipleField('users') &&
+                $entity->hasAttribute('usersColumns')
             ) {
                 $entity->loadLinkMultipleField('users', ['status' => 'acceptanceStatus']);