Built motion from commit d127c62.|0.0.151

[motion.git] / server / models / mail_account.js

diff --git a/server/models/mail_account.js b/server/models/mail_account.js
index 94efd99..d9c86ef 100644 (file)
--- a/server/models/mail_account.js
+++ b/server/models/mail_account.js
@@ -93,11 +93,11 @@ module.exports = function(sequelize, DataTypes) {
                        // SCOPES
                        MailAccount.addScope('default', {
                                where: {
-                                       service: false,
+                                       custom: false,
                                },
                                include: [{
                                        model: models.MailServerIn,
-                                       attributes: ['id', 'host', 'port', 'username', 'password', 'ssl', 'delete', 'filter', 'state', 'mailbox', 'connTimeout', 'authTimeout', 'keepalive', 'source']
+                                       attributes: ['id', 'host', 'port', 'username', 'password', 'ssl', 'delete', 'filter', 'state', 'mailbox', 'connTimeout', 'authTimeout', 'keepalive', 'source', 'polling', 'pollingTimeout']
                                }, {
                                        model: models.MailServerOut,
                                        attributes: ['id', 'host', 'port', 'username', 'password', 'ssl', 'state', 'source', 'description']