Built motion from commit ec3ecc5.|1.0.2

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

diff --git a/server/models/user.js b/server/models/user.js
index 4341c9c..f19e590 100644 (file)
--- a/server/models/user.js
+++ b/server/models/user.js
@@ -324,11 +324,11 @@ module.exports = function(sequelize, DataTypes) {
         'PROHIB_FAILED_SCREEN', 'PROHIB'),
       allowNull: true,
     },
-    permit: {
+    deny: {
       type: DataTypes.STRING,
       allowNull: true,
     },
-    deny: {
+    permit: {
       type: DataTypes.STRING,
       allowNull: true,
     },
@@ -738,7 +738,7 @@ module.exports = function(sequelize, DataTypes) {
     },
     phoneBarEnableRecording: {
       type: DataTypes.BOOLEAN,
-      defaultValue: false
+      defaultValue: true
     }
   }, {
     tableName: 'users',
@@ -997,9 +997,25 @@ module.exports = function(sequelize, DataTypes) {
         }
       });
       User.addScope('queues', {
-        include: [models.VoiceQueue, models.ChatQueue, models.MailQueue,
-          models.FaxQueue, models.SmsQueue, models.OpenchannelQueue
-        ]
+        include: [{
+          model: models.VoiceQueue,
+          required: false
+        }, {
+          model: models.ChatQueue,
+          required: false
+        }, {
+          model: models.MailQueue,
+          required: false
+        }, {
+          model: models.FaxQueue,
+          required: false
+        }, {
+          model: models.SmsQueue,
+          required: false
+        }, {
+          model: models.OpenchannelQueue,
+          required: false
+        }]
       });
 
       User.addScope('checkPauseStatus', function(query) {