Changeset 493 for Dev/trunk/src/server

Timestamp:

03/09/14 19:25:40 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• _ComplexValueMixin propagates priorityChange to children.
• Deserialize updated docs after save too.
• Validate to false if definitions are missing.

Location:

Dev/trunk/src/server

Files:

• config/couchdb-schema.json (modified) (3 diffs)
• util/validator.js (modified) (1 diff)

Dev/trunk/src/server/config/couchdb-schema.json

@@ -99 +99 @@
         "type": "object",
         "oneOf": [
+          { "$ref": "#/definitions/content/Header" },
           { "$ref": "#/definitions/content/Text" },
+          { "$ref": "#/definitions/content/Divider" },
           { "$ref": "#/definitions/content/StringInput" },
-          { "$ref": "#/definitions/content/ScaleInput" }
+          { "$ref": "#/definitions/content/TextInput" },
+          { "$ref": "#/definitions/content/NumberInput" },
+          { "$ref": "#/definitions/content/ScaleInput" },
+          { "$ref": "#/definitions/content/MultipleChoiceInput" }
         ]
       },
+      "Header": {
+        "type": "object",
+        "properties": {
+          "type": { "type": "string", "pattern": "Header" },
+          "text": { "type": "string" }
+        },
+        "required": ["type","text"],
+        "additionalProperties": false
+      },
       "Text": {
         "type": "object",
@@ -113 +127 @@
         "additionalProperties": false
       },
+      "Divider": {
+        "type": "object",
+        "properties": {
+          "type": { "type": "string", "pattern": "Divider" }
+        },
+        "additionalProperties": false
+      },
       "StringInput": {
         "type": "object",
         "properties": {
           "type": { "type": "string", "pattern": "StringInput" },
+          "text": { "type": "string" }
+        },
+        "required":["type","text"],
+        "additionalProperties": false
+      },
+      "TextInput": {
+        "type": "object",
+        "properties": {
+          "type": { "type": "string", "pattern": "TextInput" },
+          "maxLength": { "type": "integer" },
+          "text": { "type": "string" }
+        },
+        "required":["type","text"],
+        "additionalProperties": false
+      },
+      "NumberInput": {
+        "type": "object",
+        "properties": {
+          "type": { "type": "string", "pattern": "NumberInput" },
+          "min": { "type": "integer" },
+          "max": { "type": "integer" },
+          "places": { "type": "integer" },
           "text": { "type": "string" }
         },
@@ -144 +187 @@
         "required":["type","min","max","items"],
         "additionalProperties": false
+      },
+      "MultipleChoiceInput": {
+        "type": "object",
+        "properties": {
+          "type": { "type": "string", "pattern": "MultipleChoiceInput" },
+          "allowMultiple": { "type": "boolean" },
+          "items": { "type": "array", "items": {
+              "type": "object",
+              "properties": {
+                  "text": { "type": "string" }
+              },
+              "required": ["text"],
+              "additionalProperties": false
+          } }
+        },
+        "required":["type","items"],
+        "additionalProperties": false
       }
     }

Dev/trunk/src/server/util/validator.js

@@ -22 +22 @@
 });
 
-module.exports = tv4.validateResult.bind(tv4);
+module.exports = function() {
+    var result = tv4.validateResult.apply(tv4,arguments);
+    if ( result.missing.length > 0 ) {
+        result.valid = false;
+    }
+    return result;
+};