From 4d9bd8954457635c1472ae5a29e4e861a552deb3 Mon Sep 17 00:00:00 2001 From: yuri Date: Mon, 18 Dec 2017 11:53:37 +0200 Subject: [PATCH 1/3] fix task complete sent twice --- client/modules/crm/src/views/task/list.js | 26 +++++++++---------- .../modules/crm/src/views/task/record/list.js | 5 ++-- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/client/modules/crm/src/views/task/list.js b/client/modules/crm/src/views/task/list.js index 7bc72b0420..ac79066277 100644 --- a/client/modules/crm/src/views/task/list.js +++ b/client/modules/crm/src/views/task/list.js @@ -24,34 +24,34 @@ * * In accordance with Section 7(b) of the GNU General Public License version 3, * these Appropriate Legal Notices must retain the display of the "EspoCRM" word. - ************************************************************************/ - -Espo.define('Crm:Views.Task.List', 'Views.List', function (Dep) { + ************************************************************************/ + +Espo.define('crm:views/task/list', 'views/list', function (Dep) { return Dep.extend({ - + actionSetCompleted: function (data) { + if (data.isProcessed) return; + var id = data.id; if (!id) { return; - } + } var model = this.collection.get(id); if (!model) { return; } - + model.set('status', 'Completed'); - + this.listenToOnce(model, 'sync', function () { this.notify(false); this.collection.fetch(); }, this); - + this.notify('Saving...'); - model.save(); - - }, - + model.save(); + } }); - + }); diff --git a/client/modules/crm/src/views/task/record/list.js b/client/modules/crm/src/views/task/record/list.js index 591013a112..a19f900058 100644 --- a/client/modules/crm/src/views/task/record/list.js +++ b/client/modules/crm/src/views/task/record/list.js @@ -33,6 +33,8 @@ Espo.define('crm:views/task/record/list', 'views/record/list', function (Dep) { rowActionsView: 'crm:views/task/record/row-actions/default', actionSetCompleted: function (data) { + data.isProcessed = true; + var id = data.id; if (!id) { return; @@ -51,8 +53,7 @@ Espo.define('crm:views/task/record/list', 'views/record/list', function (Dep) { this.notify('Saving...'); model.save(); - - }, + } }); From a86ba2b704a5916a778d444d411892a6162e9f28 Mon Sep 17 00:00:00 2001 From: yuri Date: Mon, 18 Dec 2017 12:38:32 +0200 Subject: [PATCH 2/3] fix email smtp test and using smtpAuthMechanism for system --- application/Espo/Controllers/Email.php | 2 +- application/Espo/Core/Mail/Sender.php | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/application/Espo/Controllers/Email.php b/application/Espo/Controllers/Email.php index 4113b357d1..271dcf788e 100644 --- a/application/Espo/Controllers/Email.php +++ b/application/Espo/Controllers/Email.php @@ -110,7 +110,7 @@ class Email extends \Espo\Core\Controllers\Record } } - return $this->getRecordService()->sendTestEmail($data); + return $this->getRecordService()->sendTestEmail(get_object_vars($data)); } public function postActionMarkAsRead($params, $data, $request) diff --git a/application/Espo/Core/Mail/Sender.php b/application/Espo/Core/Mail/Sender.php index f550a1f0d2..315a9e83e9 100644 --- a/application/Espo/Core/Mail/Sender.php +++ b/application/Espo/Core/Mail/Sender.php @@ -96,7 +96,11 @@ class Sender 'connection_config' => array() ); if ($params['auth']) { - $opts['connection_class'] = 'login'; + if (!empty($params['smtpAuthMechanism'])) { + $opts['connection_class'] = $params['smtpAuthMechanism']; + } else { + $opts['connection_class'] = 'login'; + } $opts['connection_config']['username'] = $params['username']; $opts['connection_config']['password'] = $params['password']; } @@ -135,7 +139,7 @@ class Sender 'connection_config' => array() ); if ($config->get('smtpAuth')) { - $opts['connection_class'] = 'login'; + $opts['connection_class'] = $config->get('smtpAuthMechanism', 'login'); $opts['connection_config']['username'] = $config->get('smtpUsername'); $opts['connection_config']['password'] = $config->get('smtpPassword'); } From 7532ba06cd6a3ac22dd625cee5ace974314f0eeb Mon Sep 17 00:00:00 2001 From: yuri Date: Mon, 18 Dec 2017 13:47:40 +0200 Subject: [PATCH 3/3] cleanup --- client/modules/crm/src/views/task/list.js | 22 ------------------- .../modules/crm/src/views/task/record/list.js | 2 -- 2 files changed, 24 deletions(-) diff --git a/client/modules/crm/src/views/task/list.js b/client/modules/crm/src/views/task/list.js index ac79066277..ea35441f4b 100644 --- a/client/modules/crm/src/views/task/list.js +++ b/client/modules/crm/src/views/task/list.js @@ -30,28 +30,6 @@ Espo.define('crm:views/task/list', 'views/list', function (Dep) { return Dep.extend({ - actionSetCompleted: function (data) { - if (data.isProcessed) return; - - var id = data.id; - if (!id) { - return; - } - var model = this.collection.get(id); - if (!model) { - return; - } - - model.set('status', 'Completed'); - - this.listenToOnce(model, 'sync', function () { - this.notify(false); - this.collection.fetch(); - }, this); - - this.notify('Saving...'); - model.save(); - } }); }); diff --git a/client/modules/crm/src/views/task/record/list.js b/client/modules/crm/src/views/task/record/list.js index a19f900058..7c62834d31 100644 --- a/client/modules/crm/src/views/task/record/list.js +++ b/client/modules/crm/src/views/task/record/list.js @@ -33,8 +33,6 @@ Espo.define('crm:views/task/record/list', 'views/record/list', function (Dep) { rowActionsView: 'crm:views/task/record/row-actions/default', actionSetCompleted: function (data) { - data.isProcessed = true; - var id = data.id; if (!id) { return;