Built motion from commit 82438f7.|0.0.115

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

diff --git a/server/models/sms_room.js b/server/models/sms_room.js
index 4a7a8d3..7558bb3 100644 (file)
--- a/server/models/sms_room.js
+++ b/server/models/sms_room.js
@@ -5,7 +5,7 @@ module.exports = function(sequelize, DataTypes) {
     from: {
       type: DataTypes.STRING,
       validate: {
-        is: /^[0-9]+$/
+        is: /^[\+]?[0-9]+$/
       }
     },
     status: {
@@ -15,15 +15,33 @@ module.exports = function(sequelize, DataTypes) {
     tags: {
       type: DataTypes.TEXT,
       get: function() {
-        return this.getDataValue('tags') ? this.getDataValue('tags').split(';') : [];
+        var tags;
+        if (this.getDataValue('tags')) {
+          tags = this.getDataValue('tags').split(';');
+          tags.pop();
+        } else {
+          tags = [];
+        }
+        return tags;
       },
       set: function(val) {
-        this.setDataValue('tags', val.join(';'));
+        this.setDataValue('tags', val && val.length ? val.join(';') + ';' : null);
       }
     },
+    waiting: {
+      type: DataTypes.BOOLEAN,
+      defaultValue: false
+    },
     disposition: {
       type: DataTypes.STRING
     },
+    ParentId: {
+      type: DataTypes.INTEGER
+    },
+    voiceSource: {
+      type: DataTypes.BOOLEAN,
+      defaultValue: false
+    }
   }, {
     tableName: 'sms_rooms',
     associate: function(models) {