Built motion from commit eeb7beacd.|1.0.21

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

diff --git a/server/models/user.js b/server/models/user.js
index 8af4f03..d18d8e2 100644 (file)
--- a/server/models/user.js
+++ b/server/models/user.js
@@ -804,12 +804,12 @@ module.exports = function(sequelize, DataTypes) {
         through: models.UserHasModule,
         required: false
       });
+      User.belongsToMany(models.MailRoom, {
+        through: models.UserHasMailRoom,
+      });
       User.belongsToMany(models.Channel, {
         through: 'user_has_channels'
       });
-      User.belongsToMany(models.MailRoom, {
-        through: 'user_has_mail_rooms'
-      });
       User.belongsToMany(models.SmsRoom, {
         through: 'user_has_sms_rooms'
       });
@@ -1085,13 +1085,18 @@ module.exports = function(sequelize, DataTypes) {
         }
         return scope;
       });
-      User.addScope('checkQueueStatus', function(query) {//to be executed before checkOnlineStatus
+      User.addScope('checkQueueStatus', function(query) { //to be executed before checkOnlineStatus
         var scope = {
           where: {}
         };
         if (query.queueStatus) {
-          scope.where.queueStatus = query.queueStatus;
-          query.online = 'true';
+          if (query.queueStatus === 'paused') {
+            scope.where.voicePause = true;
+          } else {
+            scope.where.queueStatus = query.queueStatus;
+            scope.where.voicePause = false;
+            query.online = 'true';
+          }
           delete query.queueStatus;
         }
         return scope;