Built motion from commit 945d615.|1.0.13

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

diff --git a/server/models/user.js b/server/models/user.js
index 9d0daa9..2676b91 100644 (file)
--- a/server/models/user.js
+++ b/server/models/user.js
@@ -113,16 +113,16 @@ module.exports = function(sequelize, DataTypes) {
     voicePause: {
       type: DataTypes.BOOLEAN,
       defaultValue: false,
-      set: function(voicePause) {
-        this.setDataValue('voicePause', voicePause);
-        if (voicePause) {
-          this.setDataValue('queueStatus', 'paused');
-          this.setDataValue('queueStatusAt', moment().format("YYYY-MM-DD HH:mm:ss"));
-        } else {
-          this.setDataValue('queueStatus', 'complete');
-          this.setDataValue('queueStatusAt', moment().format("YYYY-MM-DD HH:mm:ss"));
-        }
-      }
+      // set: function(voicePause) {
+      //   this.setDataValue('voicePause', voicePause);
+      //   if (voicePause) {
+      //     this.setDataValue('queueStatus', 'paused');
+      //     this.setDataValue('queueStatusAt', moment().format("YYYY-MM-DD HH:mm:ss"));
+      //   } else {
+      //     this.setDataValue('queueStatus', 'complete');
+      //     this.setDataValue('queueStatusAt', moment().format("YYYY-MM-DD HH:mm:ss"));
+      //   }
+      // }
     },
     chatPause: {
       type: DataTypes.BOOLEAN,
@@ -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,15 @@ module.exports = function(sequelize, DataTypes) {
     },
     phoneBarEnableRecording: {
       type: DataTypes.BOOLEAN,
+      defaultValue: true
+    },
+    showWebBar: {
+      type: DataTypes.BOOLEAN,
       defaultValue: false
+    },
+    phoneBarShowOmniDesktop: {
+      type: DataTypes.BOOLEAN,
+      defaultValue: true
     }
   }, {
     tableName: 'users',
@@ -898,7 +906,9 @@ module.exports = function(sequelize, DataTypes) {
           'fullcontact',
           'port',
           'lastms',
-          'description'
+          'description',
+          'callgroup',
+          'pickupgroup'
         ]
       });
 
@@ -929,6 +939,8 @@ module.exports = function(sequelize, DataTypes) {
           'port',
           'lastms',
           'description',
+          'callgroup',
+          'pickupgroup'
         ]
       });
       User.addScope('agent', {
@@ -988,7 +1000,11 @@ module.exports = function(sequelize, DataTypes) {
           'port',
           'lastms',
           'description',
-          'loginInPause'
+          'loginInPause',
+          'showWebBar',
+          'callgroup',
+          'pickupgroup',
+          'phoneBarShowOmniDesktop'
         ]
       });
       User.addScope('telephone', {
@@ -997,9 +1013,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) {
@@ -1080,7 +1112,8 @@ module.exports = function(sequelize, DataTypes) {
             'pauseType',
             'phoneBarRemoteControl',
             'phoneBarRemoteControlPort',
-            'loginInPause'
+            'loginInPause',
+            'showWebBar'
           ],
           include: [{
             model: models.Module,