From 1ac2f489abae3e658e6bd96f431330eab669292d Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Wed, 19 Apr 2023 12:08:33 +0300 Subject: [PATCH 1/3] person-name use coalesce --- .../Espo/Core/Utils/Database/Orm/FieldConverters/PersonName.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/Espo/Core/Utils/Database/Orm/FieldConverters/PersonName.php b/application/Espo/Core/Utils/Database/Orm/FieldConverters/PersonName.php index e163add3f8..9aa581a429 100644 --- a/application/Espo/Core/Utils/Database/Orm/FieldConverters/PersonName.php +++ b/application/Espo/Core/Utils/Database/Orm/FieldConverters/PersonName.php @@ -178,6 +178,6 @@ class PersonName implements FieldConverter $item = "IFNULL:({$item}, '')"; } - return "NULLIF:(TRIM:(CONCAT:(" . implode(", ", $fullList) . ")), '')"; + return "COALESCE:(TRIM:(CONCAT:(" . implode(", ", $fullList) . ")), '')"; } } From 8b73912c3d716cd9362c581126dda311cf38c4f1 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Wed, 19 Apr 2023 12:17:23 +0300 Subject: [PATCH 2/3] revert --- .../Espo/Core/Utils/Database/Orm/FieldConverters/PersonName.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/Espo/Core/Utils/Database/Orm/FieldConverters/PersonName.php b/application/Espo/Core/Utils/Database/Orm/FieldConverters/PersonName.php index 9aa581a429..e163add3f8 100644 --- a/application/Espo/Core/Utils/Database/Orm/FieldConverters/PersonName.php +++ b/application/Espo/Core/Utils/Database/Orm/FieldConverters/PersonName.php @@ -178,6 +178,6 @@ class PersonName implements FieldConverter $item = "IFNULL:({$item}, '')"; } - return "COALESCE:(TRIM:(CONCAT:(" . implode(", ", $fullList) . ")), '')"; + return "NULLIF:(TRIM:(CONCAT:(" . implode(", ", $fullList) . ")), '')"; } } From 007cf8c2aae170df8ce1909a76d017954be646fd Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Fri, 21 Apr 2023 10:34:08 +0300 Subject: [PATCH 3/3] action button race condition fix --- client/src/views/main.js | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/client/src/views/main.js b/client/src/views/main.js index b62b202bd4..fc24e59f0b 100644 --- a/client/src/views/main.js +++ b/client/src/views/main.js @@ -561,15 +561,23 @@ define('views/main', ['view'], function (Dep) { }); }); + let processUi = () => { + this.$headerActionsContainer.find('li > .action[data-name="'+name+'"]').parent().removeClass('hidden'); + this.$headerActionsContainer.find('a.action[data-name="'+name+'"]').removeClass('hidden'); + + this.controlMenuDropdownVisibility(); + this.adjustButtons(); + }; + if (!this.isRendered()) { + if (this.isBeingRendered()) { + this.whenRendered().then(() => processUi()); + } + return; } - this.$headerActionsContainer.find('li > .action[data-name="'+name+'"]').parent().removeClass('hidden'); - this.$headerActionsContainer.find('a.action[data-name="'+name+'"]').removeClass('hidden'); - - this.controlMenuDropdownVisibility(); - this.adjustButtons(); + processUi(); }, /**