viscous/espocrm
1
0
Fork 0
mirror of https://github.com/espocrm/espocrm.git synced 2026-06-28 06:56:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://172.20.0.1/var/git/espo/backend

Browse Source
This commit is contained in:
Taras Machyshyn
2017-12-18 16:52:31 +02:00
parent fa8b77392a 00476f082b
commit f6f2010670
4 changed files with 13 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/Espo/Controllers/Email.php
View File

@@ -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)

8
application/Espo/Core/Mail/Sender.php
View File

@@ -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');
}

32
client/modules/crm/src/views/task/list.js
View File

@@ -24,34 +24,12 @@
*
* 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) {
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();
},
});
});

3
client/modules/crm/src/views/task/record/list.js
View File

@@ -51,8 +51,7 @@ Espo.define('crm:views/task/record/list', 'views/record/list', function (Dep) {
this.notify('Saving...');
model.save();
},
}
});