Changeset 512 for Dev/trunk/src/client/qed-client/pages/survey.js

Timestamp:

03/13/14 01:19:07 (11 years ago)

Author:

hendrikvanantwerpen

Message:

Small fixes fir urls and validation.

File:

• Dev/trunk/src/client/qed-client/pages/survey.js (modified) (4 diffs)

Dev/trunk/src/client/qed-client/pages/survey.js

@@ -5 +5 @@
     "../model/widgets/TabbedQuestionBrowser",
     "./_ObjectPage",
+    "dojo/Deferred",
     "dojo/_base/array",
     "dojo/_base/declare",
@@ -12 +13 @@
     "require",
     "dojo/text!./templates/survey.html"
-], function(Router, surveys, QuestionListView, TabbedQuestionBrowser, _ObjectPage, array, declare, event, lang, when, require, template) {
+], function(Router, surveys, QuestionListView, TabbedQuestionBrowser, _ObjectPage, Deferred, array, declare, event, lang, when, require, template) {
     return declare([_ObjectPage],{
         contextRequire: require,
@@ -77 +78 @@
         },
         _handleQuestionsChange: function() {
-            this.object.questions = this.questionList.get('value');
+            this._updateObject();
             this.markDirty();
             this._refresh();
         },
         _handlePropertiesChange: function() {
-            lang.mixin(this.object, this.propertiesForm.get('value').survey);
+            this._updateObject();
             this.markDirty();
             this._refresh();
             this.layout();
+        },
+        _updateObject: function() {
+            this._isValid = this.propertiesForm.validate();
+            lang.mixin(this.object, this.propertiesForm.get('value').survey);
+            this.object.questions = this.questionList.get('value');
+            return this._isValid;
         },
         _onSave: function(evt) {
@@ -109 +116 @@
             });
         },
+        _save: function() {
+            if ( this._updateObject ) {
+                return this.inherited(arguments);
+            } else {
+                return new Deferred().reject({error:"Please correct invalid values."});
+            }
+        },
         markDirty: function() {
-            this.saveBtn.set('disabled',false);
-            this.saveAndCloseBtn.set('disabled',false);
+            this.saveBtn.set('disabled',!this._isValid);
+            this.saveAndCloseBtn.set('disabled',!this._isValid);
             this.discardBtn.set('label','Discard & Close');
             this.inherited(arguments);