From 4bcf88dcee5b3170455b0016137ea96dd1dbec3c Mon Sep 17 00:00:00 2001 From: yuri Date: Thu, 12 Sep 2019 16:39:32 +0300 Subject: [PATCH 01/10] fix mail sender --- application/Espo/Core/Mail/Sender.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/Espo/Core/Mail/Sender.php b/application/Espo/Core/Mail/Sender.php index 56f4e9446f..6a807cbfe7 100644 --- a/application/Espo/Core/Mail/Sender.php +++ b/application/Espo/Core/Mail/Sender.php @@ -172,7 +172,7 @@ class Sender return $this; } - public function send(Email $email, $params = [], &$message = null, $attachmentList = []) + public function send(Email $email, $params = [], $message = null, $attachmentList = []) { if (!$message) { $message = new Message(); From 5d3a785a491ccb0d7d542a5ad755b6d31f8a175a Mon Sep 17 00:00:00 2001 From: yuri Date: Thu, 12 Sep 2019 16:41:20 +0300 Subject: [PATCH 02/10] v --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8483a6149e..e243839d8a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "espocrm", - "version": "5.6.13", + "version": "5.6.14", "description": "", "main": "index.php", "repository": { From c0866c8fea93e0bd1e8e6c42e8c5531fe6e285d2 Mon Sep 17 00:00:00 2001 From: yuri Date: Thu, 12 Sep 2019 16:57:19 +0300 Subject: [PATCH 03/10] fix email template insert --- client/src/views/email-template/record/detail.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/client/src/views/email-template/record/detail.js b/client/src/views/email-template/record/detail.js index 997b226cb4..d41210b3cd 100644 --- a/client/src/views/email-template/record/detail.js +++ b/client/src/views/email-template/record/detail.js @@ -45,6 +45,8 @@ Espo.define('views/email-template/record/detail', 'views/record/detail', functio if (!bodyView) return; if (this.model.get('isHtml')) { + var $anchor = $(window.getSelection().anchorNode); + if (!$anchor.closest('.note-editing-area').length) return; bodyView.$summernote.summernote('insertText', tag); } else { var $body = bodyView.$element; From 75c3891654160c02ea961a5185de3ef892817178 Mon Sep 17 00:00:00 2001 From: yuri Date: Thu, 12 Sep 2019 17:21:51 +0300 Subject: [PATCH 04/10] action history user type --- .../Espo/Resources/i18n/en_US/ActionHistoryRecord.json | 1 + .../Resources/layouts/ActionHistoryRecord/filters.json | 3 ++- .../Resources/metadata/entityDefs/ActionHistoryRecord.json | 7 +++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/application/Espo/Resources/i18n/en_US/ActionHistoryRecord.json b/application/Espo/Resources/i18n/en_US/ActionHistoryRecord.json index ebbee7af45..b3f18c2ce1 100644 --- a/application/Espo/Resources/i18n/en_US/ActionHistoryRecord.json +++ b/application/Espo/Resources/i18n/en_US/ActionHistoryRecord.json @@ -4,6 +4,7 @@ "action": "Action", "createdAt": "Date", "user": "User", + "userType": "User Type", "target": "Target", "targetType": "Target Type", "authToken": "Auth Token", diff --git a/application/Espo/Resources/layouts/ActionHistoryRecord/filters.json b/application/Espo/Resources/layouts/ActionHistoryRecord/filters.json index f89f25f5eb..61ccd8025b 100644 --- a/application/Espo/Resources/layouts/ActionHistoryRecord/filters.json +++ b/application/Espo/Resources/layouts/ActionHistoryRecord/filters.json @@ -3,5 +3,6 @@ "target", "createdAt", "ipAddress", - "user" + "user", + "userType" ] \ No newline at end of file diff --git a/application/Espo/Resources/metadata/entityDefs/ActionHistoryRecord.json b/application/Espo/Resources/metadata/entityDefs/ActionHistoryRecord.json index 31f023bf6b..ff38d0ca16 100644 --- a/application/Espo/Resources/metadata/entityDefs/ActionHistoryRecord.json +++ b/application/Espo/Resources/metadata/entityDefs/ActionHistoryRecord.json @@ -26,6 +26,13 @@ "user": { "type": "link" }, + "userType": { + "type": "foreign", + "link": "user", + "field": "type", + "view": "views/fields/foreign-enum", + "notStorable": true + }, "ipAddress": { "type": "varchar", "maxLength": "39" From 2946969e3a58d7c79621949649c0a0b32f72557a Mon Sep 17 00:00:00 2001 From: yuri Date: Fri, 13 Sep 2019 11:36:01 +0300 Subject: [PATCH 05/10] detail custom actions --- client/res/templates/record/detail.tpl | 2 +- client/src/utils.js | 2 + client/src/views/record/detail.js | 51 +++++++++++++++++++++++++- 3 files changed, 53 insertions(+), 2 deletions(-) diff --git a/client/res/templates/record/detail.tpl b/client/res/templates/record/detail.tpl index 0f2d52183a..2b0e58a7e6 100644 --- a/client/res/templates/record/detail.tpl +++ b/client/res/templates/record/detail.tpl @@ -10,7 +10,7 @@
    {{#each dropdownItemList}} {{#if this}} -
  • {{#if html}}{{{html}}}{{else}}{{translate label scope=../../../entityType}}{{/if}}
    • +
  • {{#if html}}{{{html}}}{{else}}{{translate label scope=../../../entityType}}{{/if}}
    • {{else}} {{#unless @first}} {{#unless @last}} diff --git a/client/src/utils.js b/client/src/utils.js index d8f68f3593..d53499b28d 100644 --- a/client/src/utils.js +++ b/client/src/utils.js @@ -39,8 +39,10 @@ define('utils', [], function () { if (typeof viewObject[method] == 'function') { viewObject[method].call(viewObject, data, e); e.preventDefault(); + e.stopPropagation(); } else if (data.handler) { e.preventDefault(); + e.stopPropagation(); require(data.handler, function (Handler) { var handler = new Handler(viewObject); handler[method].call(handler, data, e); diff --git a/client/src/views/record/detail.js b/client/src/views/record/detail.js index 1eb4f5408a..9554730c0b 100644 --- a/client/src/views/record/detail.js +++ b/client/src/views/record/detail.js @@ -254,6 +254,55 @@ define('views/record/detail', ['views/record/base', 'view-record-helper'], funct name: 'viewFollowers' }); } + + if (this.type === 'detail') { + this.additionalActionsDefs = {}; + + var additionalActionList = []; + (this.getMetadata().get(['clientDefs', this.scope, this.type + 'ActionList']) || []).forEach(function (item) { + if (typeof item === 'string') { + item = { + name: item, + label: this.translate(item, 'actions', this.scope), + }; + } + var item = Espo.Utils.clone(item); + var name = item.name; + + this.addDropdownItem(item); + + if (!Espo.Utils.checkActionAvailability(this.getHelper(), item)) return; + + additionalActionList.push(item); + + var viewObject = this; + if (item.initFunction && item.data.handler) { + this.wait(new Promise(function (resolve) { + require(item.data.handler, function (Handler) { + var handler = new Handler(viewObject); + handler[item.initFunction].call(handler); + resolve(); + }); + })); + } + + if (!Espo.Utils.checkActionAccess(this.getAcl(), this.model, item, true)) { + item.hidden = true; + } + }, this); + + if (additionalActionList.length) { + this.listenTo(this.model, 'sync', function () { + additionalActionList.forEach(function (item) { + if (Espo.Utils.checkActionAccess(this.getAcl(), this.model, item, true)) { + this.showActionItem(item.name); + } else { + this.hideActionItem(item.name); + } + }, this); + }, this); + } + } }, disableActionItems: function () { @@ -1518,7 +1567,7 @@ define('views/record/detail', ['views/record/base', 'view-record-helper'], funct } this.getRouter().navigate(url, {trigger: true}); - } + }, }); }); From 98084e931453ea2751cd790860b3e0422a1be11f Mon Sep 17 00:00:00 2001 From: yuri Date: Fri, 13 Sep 2019 11:37:55 +0300 Subject: [PATCH 06/10] formula addLinkMultipleId do not throw error --- .../Formula/Functions/EntityGroup/AddLinkMultipleIdType.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/Espo/Core/Formula/Functions/EntityGroup/AddLinkMultipleIdType.php b/application/Espo/Core/Formula/Functions/EntityGroup/AddLinkMultipleIdType.php index 82c70a6913..1016894bdc 100644 --- a/application/Espo/Core/Formula/Functions/EntityGroup/AddLinkMultipleIdType.php +++ b/application/Espo/Core/Formula/Functions/EntityGroup/AddLinkMultipleIdType.php @@ -65,7 +65,7 @@ class AddLinkMultipleIdType extends \Espo\Core\Formula\Functions\Base } } else { if (!is_string($id)) { - throw new Error(); + return; } $this->getEntity()->addLinkMultipleId($link, $id); } From 2dbde4e2c8431ad5ecb7e92181148157edafbd66 Mon Sep 17 00:00:00 2001 From: yuri Date: Fri, 13 Sep 2019 11:58:04 +0300 Subject: [PATCH 07/10] fix detail action label --- client/src/views/record/detail.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/src/views/record/detail.js b/client/src/views/record/detail.js index 9554730c0b..43372d2861 100644 --- a/client/src/views/record/detail.js +++ b/client/src/views/record/detail.js @@ -263,12 +263,13 @@ define('views/record/detail', ['views/record/base', 'view-record-helper'], funct if (typeof item === 'string') { item = { name: item, - label: this.translate(item, 'actions', this.scope), }; } var item = Espo.Utils.clone(item); var name = item.name; + if (!item.label) item.html = this.translate(name, 'actions', this.scope); + this.addDropdownItem(item); if (!Espo.Utils.checkActionAvailability(this.getHelper(), item)) return; From 3a37f8421d8e4c61ae9f99ed1b3f553fd5afa288 Mon Sep 17 00:00:00 2001 From: yuri Date: Fri, 13 Sep 2019 12:25:50 +0300 Subject: [PATCH 08/10] fix action handler --- client/src/utils.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/client/src/utils.js b/client/src/utils.js index d53499b28d..38b1283ed4 100644 --- a/client/src/utils.js +++ b/client/src/utils.js @@ -33,6 +33,8 @@ define('utils', [], function () { handleAction: function (viewObject, e) { var $target = $(e.currentTarget); var action = $target.data('action'); + + var fired = false; if (action) { var data = $target.data(); var method = 'action' + Espo.Utils.upperCaseFirst(action); @@ -40,14 +42,26 @@ define('utils', [], function () { viewObject[method].call(viewObject, data, e); e.preventDefault(); e.stopPropagation(); + fired = true; } else if (data.handler) { e.preventDefault(); e.stopPropagation(); + fired = true; require(data.handler, function (Handler) { var handler = new Handler(viewObject); handler[method].call(handler, data, e); }); } + + if (fired) { + var $dropdown = $target.closest('.dropdown-menu'); + if ($dropdown.length) { + var $dropdownToggle = $dropdown.parent().find('[data-toggle="dropdown"]'); + if ($dropdownToggle.length) { + $dropdownToggle.dropdown('toggle'); + } + } + } } }, From 00a0cb139451a8a00aa3d3c34e84fa40078dae75 Mon Sep 17 00:00:00 2001 From: yuri Date: Fri, 13 Sep 2019 12:58:31 +0300 Subject: [PATCH 09/10] fix test --- tests/unit/Espo/Core/Utils/LanguageTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/Espo/Core/Utils/LanguageTest.php b/tests/unit/Espo/Core/Utils/LanguageTest.php index e9d01897bc..cd4417a47d 100644 --- a/tests/unit/Espo/Core/Utils/LanguageTest.php +++ b/tests/unit/Espo/Core/Utils/LanguageTest.php @@ -131,7 +131,7 @@ class LanguageTest extends \PHPUnit\Framework\TestCase 'en_US' => 'English (United States)', ] ], - 'testHtml' => '<a href="javascript: alert(1)">test</a>', + 'testHtml' => '<a href="javascript: alert(1)">test</a>', ], ]; From f8bafa522146009a6e2f7e21f2d627761ac2dc22 Mon Sep 17 00:00:00 2001 From: yuri Date: Fri, 13 Sep 2019 12:58:44 +0300 Subject: [PATCH 10/10] fix orm order --- application/Espo/Modules/Crm/Services/Activities.php | 2 +- application/Espo/ORM/DB/Query/Base.php | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/application/Espo/Modules/Crm/Services/Activities.php b/application/Espo/Modules/Crm/Services/Activities.php index f51b35a702..87a99cc85e 100644 --- a/application/Espo/Modules/Crm/Services/Activities.php +++ b/application/Espo/Modules/Crm/Services/Activities.php @@ -739,7 +739,7 @@ class Activities extends \Espo\Core\Services\Base $orderBy = null; $order = null; if (!empty($selectParams['orderBy'])) { - $order = $selectParams['order']; + $order = $selectParams['order'] ?? null; $orderBy = $selectParams['orderBy']; } diff --git a/application/Espo/ORM/DB/Query/Base.php b/application/Espo/ORM/DB/Query/Base.php index 907fe9c9a7..d5ed5aa893 100644 --- a/application/Espo/ORM/DB/Query/Base.php +++ b/application/Espo/ORM/DB/Query/Base.php @@ -1082,7 +1082,7 @@ abstract class Base if (!empty($item[1])) { $orderInternal = $item[1]; } - $arr[] = $this->getOrderPart($entity, $orderByInternal, $orderInternal, false, $params); + $arr[] = $this->getOrderPart($entity, $orderByInternal, $orderInternal, $useColumnAlias, $params); } } return implode(", ", $arr); @@ -1090,7 +1090,11 @@ abstract class Base if (strpos($orderBy, 'LIST:') === 0) { list($l, $field, $list) = explode(':', $orderBy); - $fieldPath = $this->getFieldPathForOrderBy($entity, $field, $params); + if ($useColumnAlias) { + $fieldPath = '`'. $this->sanitizeSelectAlias($field) . '`'; + } else { + $fieldPath = $this->getFieldPathForOrderBy($entity, $field, $params); + } $listQuoted = []; $list = array_reverse(explode(',', $list)); foreach ($list as $i => $listItem) {