Merge lp:~methanal-developers/methanal/1250847-simpleform-validation into lp:methanal

[Jonathan Jacobs]

[Tristan Seligmann (mithrandi)]

review: Approve

=== modified file 'methanal/js/Methanal/View.js'
--- methanal/js/Methanal/View.js	2012-07-30 15:36:53 +0000
+++ methanal/js/Methanal/View.js	2013-11-13 13:18:25 +0000
@@ -1437,14 +1437,18 @@
 Methanal.View.LiveForm.subclass(Methanal.View, 'SimpleForm').methods(
     function __init__(self, node, controlNames) {
         Methanal.View.SimpleForm.upcall(
-            self, '__init__', node, {'viewOnly': true}, controlNames);
+            self, '__init__', node, {}, controlNames);
         self.hideModificationIndicator = true;
+        self.valid = true;
     },
 
 
     function nodeInserted(self) {
         // Explicitly override LiveForm's "nodeInserted" method, most of the
         // nodes it attempts to find will not exist in a simple form.
+        if (self.viewOnly === undefined && self.widgetParent.getForm) {
+            self.viewOnly = self.widgetParent.getForm().viewOnly;
+        }
     },
 
 
@@ -1454,11 +1458,13 @@
 
 
     function setValid(self) {
+        self.valid = true;
         self.widgetParent.clearError();
     },
 
 
     function setInvalid(self, invalidControls) {
+        self.valid = false;
         self.widgetParent.setError('');
     });
 
@@ -1668,8 +1674,10 @@
         Methanal.Util.addElementClass(self.node, 'methanal-control-error');
         self.error = error;
         self.widgetParent.checkForErrors();
-        self._errorTooltip.setText(self.error);
-        self._errorTooltip.show();
+        if (self.error && self.error.length) {
+            self._errorTooltip.setText(self.error);
+            self._errorTooltip.show();
+        }
     },
 
 

=== modified file 'methanal/js/Methanal/Widgets.js'
--- methanal/js/Methanal/Widgets.js	2012-11-21 06:18:32 +0000
+++ methanal/js/Methanal/Widgets.js	2013-11-13 13:18:25 +0000
@@ -1362,6 +1362,14 @@
     function resultChanged(self, control) {
     },
 
+    function setInvalid(self, invalidControls) {
+        Methanal.Widgets.LookupForm.upcall(self, 'setInvalid', invalidControls);
+        if (invalidControls.length === 1 &&
+            invalidControls[0].name === '__result__') {
+            self.valid = true;
+        }
+    },
+
 
     function valueChanged(self, control) {
         Methanal.Widgets.LookupForm.upcall(
@@ -1375,6 +1383,11 @@
         // Trigger Lookup.onChange so the parent form refreshes validators.
         self.widgetParent.onChange(control.node, self._initialisedOnce);
 
+        if (!self.valid) {
+            self.setResults([]);
+            return;
+        }
+
         // Don't trigger when the result input is changed or when there are
         // validation errors.
         if (control.name === '__result__') {