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 f19e590..2676b91 100644 (file)
--- a/server/models/user.js
+++ b/server/models/user.js
@@ -739,6 +739,14 @@ 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', {
@@ -1096,7 +1112,8 @@ module.exports = function(sequelize, DataTypes) {
             'pauseType',
             'phoneBarRemoteControl',
             'phoneBarRemoteControlPort',
-            'loginInPause'
+            'loginInPause',
+            'showWebBar'
           ],
           include: [{
             model: models.Module,