Built motion from commit 3594e56.|0.0.120

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

diff --git a/server/models/mail_account.js b/server/models/mail_account.js
index 4e69e7b..3235d20 100644 (file)
--- a/server/models/mail_account.js
+++ b/server/models/mail_account.js
@@ -26,12 +26,18 @@ module.exports = function(sequelize, DataTypes) {
                timeout: {
                        type: DataTypes.INTEGER,
                        defaultValue: 0
+               },
+               whiteLabel: {
+                       type: DataTypes.STRING
                }
        }, {
                tableName: 'mail_accounts',
                associate: function(models) {
                        // RELATIONS
+                       MailAccount.belongsTo(models.List);
+                       MailAccount.belongsTo(models.Template);
                        MailAccount.hasMany(models.MailRoom);
+                       MailAccount.hasMany(models.MailDisposition);
                        MailAccount.hasMany(models.MailApplication);
                        MailAccount.hasOne(models.MailServerIn, {
                                onDelete: 'cascade',
@@ -46,10 +52,10 @@ module.exports = function(sequelize, DataTypes) {
                        MailAccount.addScope('default', {
                                include: [{
                                        model: models.MailServerIn,
-                                       attributes: ['id', 'host', 'port', 'username', 'password', 'ssl', 'delete', 'filter', 'state', 'mailbox', 'connTimeout', 'authTimeout', 'keepalive']
+                                       attributes: ['id', 'host', 'port', 'username', 'password', 'ssl', 'delete', 'filter', 'state', 'mailbox', 'connTimeout', 'authTimeout', 'keepalive', 'source']
                                }, {
                                        model: models.MailServerOut,
-                                       attributes: ['id', 'host', 'port', 'username', 'password', 'ssl', 'service', 'state']
+                                       attributes: ['id', 'host', 'port', 'username', 'password', 'ssl', 'service', 'state', 'source']
                                }, {
                                        model: models.MailApplication,
                                        include: [{