From ae874c44f5a6e48894f963536e195c1aab0444d0 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Sat, 22 Feb 2020 19:17:03 -0300 Subject: [PATCH 1/4] add client/custom to perm check --- application/Espo/Core/Utils/File/Permission.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/application/Espo/Core/Utils/File/Permission.php b/application/Espo/Core/Utils/File/Permission.php index 85bf11ddf7..0614de795f 100644 --- a/application/Espo/Core/Utils/File/Permission.php +++ b/application/Espo/Core/Utils/File/Permission.php @@ -52,6 +52,9 @@ class Permission 'application/Espo/Modules' => [ 'recursive' => false, ], + 'client/custom' => [ + 'recursive' => true, + ], 'client/modules' => [ 'recursive' => false, ], From ffe83d24ce16b528b9decace80aadef3b984ac2b Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Thu, 5 Mar 2020 11:53:16 +0200 Subject: [PATCH 2/4] compose email: skip appending initial body if changed --- client/src/views/email/record/compose.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/views/email/record/compose.js b/client/src/views/email/record/compose.js index adfa476109..188461b8bb 100644 --- a/client/src/views/email/record/compose.js +++ b/client/src/views/email/record/compose.js @@ -109,7 +109,7 @@ define('views/email/record/compose', ['views/record/edit', 'views/email/record/d body = this.appendSignature(body || '', data.isHtml); } - if (this.initialBody) { + if (this.initialBody && !this.isBodyChanged) { var initialBody = this.initialBody; if (data.isHtml !== this.initialIsHtml) { if (data.isHtml) { From 5e3f00f11d401b77554e66356c2850c13b47dccf Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Thu, 5 Mar 2020 12:40:07 +0200 Subject: [PATCH 3/4] tootltip link in new tab --- client/src/view-helper.js | 4 ++++ client/src/views/fields/base.js | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/client/src/view-helper.js b/client/src/view-helper.js index 6595f11ca3..3901ed54a2 100644 --- a/client/src/view-helper.js +++ b/client/src/view-helper.js @@ -333,6 +333,10 @@ define('view-helper', ['lib!client/lib/purify.min.js'], function () { text = DOMPurify.sanitize(text).toString(); + if (options.linksInNewTab) { + text = text.replace(/ Date: Thu, 5 Mar 2020 16:28:16 +0200 Subject: [PATCH 4/4] page title update fix --- client/src/views/detail.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/client/src/views/detail.js b/client/src/views/detail.js index ab32242e20..68338ab697 100644 --- a/client/src/views/detail.js +++ b/client/src/views/detail.js @@ -74,6 +74,8 @@ define('views/detail', 'views/main', function (Dep) { this.setupHeader(); this.setupRecord(); + this.setupPageTitle(); + if (this.getMetadata().get('scopes.' + this.scope + '.stream')) { if (this.model.has('isFollowed')) { this.handleFollowButton(); @@ -85,6 +87,17 @@ define('views/detail', 'views/main', function (Dep) { } }, + setupPageTitle: function () { + this.listenTo(this.model, 'after:save', function () { + this.updatePageTitle(); + }, this); + this.listenTo(this.model, 'sync', function (model) { + if (model && model.hasChanged('name')) { + this.updatePageTitle(); + } + }, this); + }, + setupHeader: function () { this.createView('header', this.headerView, { model: this.model, @@ -98,7 +111,6 @@ define('views/detail', 'views/main', function (Dep) { if (this.getView('header')) { this.getView('header').reRender(); } - this.updatePageTitle(); } }, this); },