From c500b304842289fc3b55579bd90e75c95178c4a2 Mon Sep 17 00:00:00 2001 From: Taras Machyshyn Date: Wed, 29 Dec 2021 12:15:39 +0200 Subject: [PATCH 1/2] Notification fix --- client/src/views/notification/badge.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/client/src/views/notification/badge.js b/client/src/views/notification/badge.js index 083c56be9a..f2356cd1b4 100644 --- a/client/src/views/notification/badge.js +++ b/client/src/views/notification/badge.js @@ -158,11 +158,14 @@ define('views/notification/badge', 'view', function (Dep) { }, checkBypass: function () { - var last = this.getRouter().getLast() || {}; + let last = this.getRouter().getLast() || {}; + + let pageAction = (last.options || {}).page || null; if ( last.controller === 'Admin' && - ~['upgrade', 'extensions'].indexOf(last.action) + last.action === 'page' && + ~['upgrade', 'extensions'].indexOf(pageAction) ) { return true; } From 150e41a26d7aae5ecce7302ca3021549464fe6c5 Mon Sep 17 00:00:00 2001 From: Eymen Elkum Date: Thu, 30 Dec 2021 16:39:28 +0300 Subject: [PATCH 2/2] fix folder name (#2180) * fix folder name * remove trim folder name on inbound --- application/Espo/Services/EmailAccount.php | 2 +- application/Espo/Services/InboundEmail.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/Espo/Services/EmailAccount.php b/application/Espo/Services/EmailAccount.php index b5037a98bf..f5b777c159 100644 --- a/application/Espo/Services/EmailAccount.php +++ b/application/Espo/Services/EmailAccount.php @@ -377,7 +377,7 @@ class EmailAccount extends Record implements } foreach ($monitoredFolders as $folder) { - $folder = mb_convert_encoding(trim($folder), 'UTF7-IMAP', 'UTF-8'); + $folder = mb_convert_encoding($folder, 'UTF7-IMAP', 'UTF-8'); $portionLimit = $this->getConfig()->get('personalEmailMaxPortionSize', self::PORTION_LIMIT); diff --git a/application/Espo/Services/InboundEmail.php b/application/Espo/Services/InboundEmail.php index 689db23312..3c60f287c5 100644 --- a/application/Espo/Services/InboundEmail.php +++ b/application/Espo/Services/InboundEmail.php @@ -268,7 +268,7 @@ class InboundEmail extends RecordService implements } foreach ($monitoredFolders as $folder) { - $folder = mb_convert_encoding(trim($folder), 'UTF7-IMAP', 'UTF-8'); + $folder = mb_convert_encoding($folder, 'UTF7-IMAP', 'UTF-8'); $portionLimit = $this->config->get('inboundEmailMaxPortionSize', self::PORTION_LIMIT);