Merge lp:~methanal-developers/methanal/1342097-fix-groupinput into lp:methanal

[Tristan Seligmann]

[Jonathan Jacobs (jjacobs)]

Looks good to me.

review: Approve

=== modified file 'methanal/js/Methanal/View.js'
--- methanal/js/Methanal/View.js	2013-11-13 13:14:11 +0000
+++ methanal/js/Methanal/View.js	2014-07-15 12:42:47 +0000
@@ -1540,6 +1540,16 @@
 
     function setInvalid(self) {
         self.valid = false;
+    },
+
+
+    /**
+     * Internal method for determining whether to set C{fullyLoaded} and
+     * finalise form loading. The FormBehaviour implementation is overridden
+     * because GroupInput does not have an action container.
+     */
+    function _isFullyLoaded(self) {
+        return self.controlsLoaded && !self.fullyLoaded;
     });
 
 
@@ -1590,6 +1600,28 @@
         self.inputNode = self.getInputNode();
         self._errorTooltip = Methanal.Util.Tooltip(
             self.node, null, 'left', 'error-tooltip');
+        self._checkLoaded();
+    },
+
+
+    /**
+     * Check if the parent form should be notified that this input is loaded.
+     *
+     * Subclasses can override this if they have additional requirements that
+     * must be satisfied before declaring themselves as loaded.
+     */
+    function _checkLoaded(self) {
+        self._notifyLoaded();
+    },
+
+
+    /**
+     * Notify this input's parent form that this input is loaded.
+     *
+     * This method should not be called before C{self.getValue()} is able to
+     * succeed.
+     */
+    function _notifyLoaded(self) {
         self.reset();
 
         function _baseValidator(value) {

=== modified file 'methanal/js/Methanal/Widgets.js'
--- methanal/js/Methanal/Widgets.js	2014-03-14 13:48:19 +0000
+++ methanal/js/Methanal/Widgets.js	2014-07-15 12:42:47 +0000
@@ -1133,12 +1133,17 @@
         Methanal.Widgets.Lookup.upcall(self, '__init__', node, args);
         self._lookupForm = null;
         self._waitForForm = Divmod.Defer.Deferred();
+        self._waitForLookupForm = Divmod.Defer.Deferred();
     },
 
 
     function formLoaded(self, form) {
         self._lookupForm = form;
-        self.getForm()._waitForForm.addCallback(function () {
+        self._waitForLookupForm.callback(null);
+        self._waitForLookupForm = Divmod.Defer.Deferred();
+
+        var parentForm = self.getForm();
+        parentForm._waitForForm.addCallback(function () {
             self._waitForForm.callback(null);
             self._waitForForm = Divmod.Defer.succeed(null);
         });
@@ -1146,6 +1151,18 @@
 
 
     /**
+     * Check if the parent form should be notified that this input is loaded.
+     *
+     * This input is not loaded until the lookup form has loaded.
+     */
+    function _checkLoaded(self) {
+        self._waitForLookupForm.addCallback(function () {
+            self._notifyLoaded();
+        });
+    },
+
+
+    /**
      * Handler for the "onchange" DOM event.
      *
      * Inform the containing form that our value has changed.

=== modified file 'methanal/model.py'
--- methanal/model.py	2011-04-29 08:51:24 +0000
+++ methanal/model.py	2014-07-15 12:42:47 +0000
@@ -303,7 +303,7 @@
     if isinstance(attr, attributes.reference):
         if attr.reftype is None:
             raise ValueError('%r has no reference type' % (attr,))
-        model = ItemModel(itemClass=attr.reftype, store=store)
+        model = ItemModel(item=value, itemClass=attr.reftype, store=store)
         return ReferenceParameter(name=name,
                                   value=value,
                                   doc=doc,