Merge lp:~methanal-developers/methanal/824522-patient-lookup into lp:methanal

[Jonathan Jacobs]

[Tristan Seligmann (mithrandi)]

review: Approve

=== modified file 'methanal/js/Methanal/View.js'
--- methanal/js/Methanal/View.js	2011-07-21 20:19:58 +0000
+++ methanal/js/Methanal/View.js	2011-08-11 14:23:23 +0000
@@ -374,6 +374,7 @@
      * attributes.
      */
     function formInit(self) {
+        self._waitForForm = Divmod.Defer.Deferred();
         self._frozen = 0;
         self.controls = {};
         self.subforms = {};
@@ -557,6 +558,8 @@
         self._stripeControls();
         // Thaw freeze from formInit.
         self.thaw();
+        self._waitForForm.callback(null);
+        self._waitForForm = Divmod.Defer.succeed(null);
         self.formLoaded();
 
         if (self.viewOnly && self.actions) {

=== modified file 'methanal/js/Methanal/Widgets.js'
--- methanal/js/Methanal/Widgets.js	2011-07-13 12:58:09 +0000
+++ methanal/js/Methanal/Widgets.js	2011-08-11 14:23:23 +0000
@@ -1110,8 +1110,10 @@
 
     function formLoaded(self, form) {
         self._lookupForm = form;
-        self._waitForForm.callback(null);
-        self._waitForForm = Divmod.Defer.succeed(null);
+        self.getForm()._waitForForm.addCallback(function () {
+            self._waitForForm.callback(null);
+            self._waitForForm = Divmod.Defer.succeed(null);
+        });
     },