From fb4730942fdd1e4b1e1df3bce4860f7f66465f09 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Wed, 8 Jun 2022 15:23:18 +0300 Subject: [PATCH 1/2] datetime time format map --- client/src/views/fields/datetime.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/client/src/views/fields/datetime.js b/client/src/views/fields/datetime.js index d1b3f80648..74004bc4d6 100644 --- a/client/src/views/fields/datetime.js +++ b/client/src/views/fields/datetime.js @@ -64,6 +64,8 @@ define('views/fields/datetime', ['views/fields/date', 'lib!moment'], function (D 'HH:mm': 'H:i', 'hh:mm A': 'h:i A', 'hh:mm a': 'h:i a', + 'hh:mmA': 'h:iA', + 'hh:mma': 'h:ia', }, data: function () { From e267c8804350444bd1f8de020ca73f15824624fe Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Thu, 9 Jun 2022 09:39:48 +0300 Subject: [PATCH 2/2] fix label manager empty array --- application/Espo/Tools/LabelManager/LabelManager.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/application/Espo/Tools/LabelManager/LabelManager.php b/application/Espo/Tools/LabelManager/LabelManager.php index 4f4129d19f..9082b35d7e 100644 --- a/application/Espo/Tools/LabelManager/LabelManager.php +++ b/application/Espo/Tools/LabelManager/LabelManager.php @@ -293,6 +293,10 @@ class LabelManager implements $languageObj->save(); + if ($returnDataHash === []) { + return (object) []; + } + return json_decode(Json::encode($returnDataHash)); } }