[Checkins] SVN: grok/trunk/ use _get_layout() from grokcore.layout's layoutawere mixin

[Jan Wijbrand Kolman]

Log message for revision 125814:
  use _get_layout() from grokcore.layout's layoutawere mixin

Changed:
  U   grok/trunk/CHANGES.txt
  U   grok/trunk/setup.py
  U   grok/trunk/src/grok/components.py

-=-
Modified: grok/trunk/CHANGES.txt
===================================================================
--- grok/trunk/CHANGES.txt	2012-05-10 10:39:55 UTC (rev 125813)
+++ grok/trunk/CHANGES.txt	2012-05-10 10:57:46 UTC (rev 125814)
@@ -4,9 +4,9 @@
 1.10.3 (unreleased)
 ===================
 
-- Nothing changed yet.
+- Make sure the correct layout is retrieved for layout aware form components
+  too.
 
-
 1.10.2 (2012-05-10)
 ===================
 

Modified: grok/trunk/setup.py
===================================================================
--- grok/trunk/setup.py	2012-05-10 10:39:55 UTC (rev 125813)
+++ grok/trunk/setup.py	2012-05-10 10:57:46 UTC (rev 125814)
@@ -48,7 +48,7 @@
         'grokcore.content >= 1.1',
         'grokcore.formlib >= 1.4',
         'grokcore.json >= 1.2',
-        'grokcore.layout >= 1.5',
+        'grokcore.layout >= 1.6.dev0',
         'grokcore.message',
         'grokcore.rest >= 1.3',
         'grokcore.security[role] >= 1.6',

Modified: grok/trunk/src/grok/components.py
===================================================================
--- grok/trunk/src/grok/components.py	2012-05-10 10:39:55 UTC (rev 125813)
+++ grok/trunk/src/grok/components.py	2012-05-10 10:57:46 UTC (rev 125814)
@@ -296,6 +296,7 @@
     def __call__(self):
         """Calls update and returns the layout template which calls render.
         """
+        self.layout = self._get_layout()
         mapply(self.update, (), self.request)
         if self.request.response.getStatus() in (302, 303):
             # A redirect was triggered somewhere in update().  Don't
@@ -306,8 +307,6 @@
         self.update_form()
         if self.request.response.getStatus() in (302, 303):
             return
-        self.layout = zope.component.getMultiAdapter(
-            (self.request, self.context), grokcore.layout.ILayout)
         return self.layout(self)