Built motion from commit 98555a2.|1.0.12

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

diff --git a/server/models/voice_queue.js b/server/models/voice_queue.js
index 71d35c8..ccc5333 100644 (file)
--- a/server/models/voice_queue.js
+++ b/server/models/voice_queue.js
@@ -8,7 +8,10 @@ module.exports = function(sequelize, DataTypes) {
       unique: true,
       validate: {
         notEmpty: true,
-        is: /^[A-Za-z0-9\.\_]+$/i
+        is: {
+          args: /^[A-Za-z0-9._\+*!\-\[\]]+$/,
+          msg: 'The name is not valid!'
+        }
       },
     },
     musiconhold: {
@@ -43,12 +46,12 @@ module.exports = function(sequelize, DataTypes) {
     timeout: {
       type: DataTypes.INTEGER(11),
       allowNull: true,
-      defaultValue: 0
+      defaultValue: 15
     },
     retry: {
       type: DataTypes.INTEGER(11),
       allowNull: true,
-      defaultValue: 0
+      defaultValue: 2
     },
     timeoutpriority: {
       type: DataTypes.STRING,
@@ -292,6 +295,10 @@ module.exports = function(sequelize, DataTypes) {
         foreignKey: 'queue',
         required: false
       });
+      VoiceQueue.belongsToMany(models.User, {
+        through: models.UserHasVoiceQueuePermit,
+        as: 'PVoiceQueues'
+      });
     }
   });