[Checkins] SVN: z3c.form/trunk/ revert r127831

[Adam Groszer]

Log message for revision 127851:
  revert r127831
  sorry Malthe, you've been mailed and I need to release

Changed:
  U   z3c.form/trunk/CHANGES.txt
  U   z3c.form/trunk/src/z3c/form/form.py
  U   z3c.form/trunk/src/z3c/form/group.py

-=-
Modified: z3c.form/trunk/CHANGES.txt
===================================================================
--- z3c.form/trunk/CHANGES.txt	2012-09-16 22:16:45 UTC (rev 127850)
+++ z3c.form/trunk/CHANGES.txt	2012-09-17 13:10:45 UTC (rev 127851)
@@ -16,13 +16,6 @@
 
 - Split ``configure.zcml``
 
-- Initialize widgets in ``update`` step. The ``updateWidgets`` method
-  is now responsible only for actually updating the widgets.
-
-  This allows updating the common widgets prefix before the individual
-  widgets are updated, useful for situations where neither a form, nor
-  a widgets prefix is desired.
-
 - ``SequenceWidget`` DISPLAY_MODE: silently ignore missing tokens,
   because INPUT_MODE and HIDDEN_MODE does that too
 

Modified: z3c.form/trunk/src/z3c/form/form.py
===================================================================
--- z3c.form/trunk/src/z3c/form/form.py	2012-09-16 22:16:45 UTC (rev 127850)
+++ z3c.form/trunk/src/z3c/form/form.py	2012-09-17 13:10:45 UTC (rev 127851)
@@ -123,6 +123,8 @@
 
     def updateWidgets(self):
         '''See interfaces.IForm'''
+        self.widgets = zope.component.getMultiAdapter(
+            (self, self.request, self.getContent()), interfaces.IWidgets)
         self.widgets.mode = self.mode
         self.widgets.ignoreContext = self.ignoreContext
         self.widgets.ignoreRequest = self.ignoreRequest
@@ -143,8 +145,6 @@
 
     def update(self):
         '''See interfaces.IForm'''
-        self.widgets = zope.component.getMultiAdapter(
-            (self, self.request, self.getContent()), interfaces.IWidgets)
         self.updateWidgets()
 
     def render(self):

Modified: z3c.form/trunk/src/z3c/form/group.py
===================================================================
--- z3c.form/trunk/src/z3c/form/group.py	2012-09-16 22:16:45 UTC (rev 127850)
+++ z3c.form/trunk/src/z3c/form/group.py	2012-09-17 13:10:45 UTC (rev 127851)
@@ -34,6 +34,8 @@
 
     def updateWidgets(self):
         '''See interfaces.IForm'''
+        self.widgets = zope.component.getMultiAdapter(
+            (self, self.request, self.getContent()), interfaces.IWidgets)
         for attrName in ('mode', 'ignoreRequest', 'ignoreContext',
                          'ignoreReadonly'):
             value = getattr(self.parentForm.widgets, attrName)
@@ -42,7 +44,7 @@
 
     def update(self):
         '''See interfaces.IForm'''
-        super(Group, self).update()
+        self.updateWidgets()
         groups = []
         for groupClass in self.groups:
             # only instantiate the groupClass if it hasn't already
@@ -119,10 +121,9 @@
 
         return changed
 
-    def updateWidgets(self):
+    def update(self):
         '''See interfaces.IForm'''
-        super(GroupForm, self).updateWidgets()
-
+        self.updateWidgets()
         groups = []
         for groupClass in self.groups:
             # only instantiate the groupClass if it hasn't already
@@ -134,3 +135,7 @@
             group.update()
             groups.append(group)
         self.groups = tuple(groups)
+        self.updateActions()
+        self.actions.execute()
+        if self.refreshActions:
+            self.updateActions()