Built motion from commit 2e74e5e.|0.0.138

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

diff --git a/server/models/user.js b/server/models/user.js
index 26be9e1..41bb31e 100644 (file)
--- a/server/models/user.js
+++ b/server/models/user.js
@@ -118,12 +118,10 @@ module.exports = function(sequelize, DataTypes) {
         this.setDataValue('voicePause', voicePause);
         if (voicePause) {
           this.setDataValue('queueStatus', 'paused');
-          this.setDataValue('queueStatusAt', moment().format(
-            "YYYY-MM-DD HH:mm:ss"));
+          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"));
+          this.setDataValue('queueStatusAt', moment().format("YYYY-MM-DD HH:mm:ss"));
         }
       }
     },
@@ -698,7 +696,7 @@ module.exports = function(sequelize, DataTypes) {
     call_limit: {
       type: DataTypes.INTEGER(11),
       allowNull: true,
-      defaultValue: null
+      defaultValue: 10
     },
     registertrying: { //Send a 100 Trying when the device registers.
       type: DataTypes.ENUM('yes', 'no'),
@@ -729,6 +727,16 @@ module.exports = function(sequelize, DataTypes) {
       allowNull: true,
       defaultValue: 'no'
     },
+    loginInPause: {
+      type: DataTypes.BOOLEAN,
+      defaultValue: false
+    },
+    resetPasswordToken: {
+      type: DataTypes.STRING
+    },
+    resetPasswordExpires: {
+      type: DataTypes.DATE
+    }
   }, {
     tableName: 'users',
     instanceMethods: {
@@ -917,7 +925,7 @@ module.exports = function(sequelize, DataTypes) {
           'fullcontact',
           'port',
           'lastms',
-          'description'
+          'description',
         ]
       });
       User.addScope('agent', {
@@ -975,7 +983,8 @@ module.exports = function(sequelize, DataTypes) {
           'fullcontact',
           'port',
           'lastms',
-          'description'
+          'description',
+          'loginInPause'
         ]
       });
       User.addScope('telephone', {