[Checkins] SVN: z3ext.layout/trunk/src/z3ext/layout/

[Nikolay Kim]

Log message for revision 92679:
  

Changed:
  U   z3ext.layout/trunk/src/z3ext/layout/pagelet.py
  U   z3ext.layout/trunk/src/z3ext/layout/tales.py

-=-
Modified: z3ext.layout/trunk/src/z3ext/layout/pagelet.py
===================================================================
--- z3ext.layout/trunk/src/z3ext/layout/pagelet.py	2008-10-29 18:13:07 UTC (rev 92678)
+++ z3ext.layout/trunk/src/z3ext/layout/pagelet.py	2008-10-29 18:21:44 UTC (rev 92679)
@@ -78,7 +78,7 @@
     def __call__(self):
         self.update()
 
-        if self.isRedirected:
+        if self.isRedirected or self.request.response.getStatus() in (302, 303):
             return u''
 
         layout = queryLayout(self, self.request, name=self.layoutname)
@@ -137,6 +137,8 @@
             view = queryMultiAdapter((self.context, self.request), iface)
             if view is not None:
                 view.update()
+                if view.isRedirected:
+                    return u''
                 return view.render()
         except Exception, err:
             log = logging.getLogger('z3ext.layout')

Modified: z3ext.layout/trunk/src/z3ext/layout/tales.py
===================================================================
--- z3ext.layout/trunk/src/z3ext/layout/tales.py	2008-10-29 18:13:07 UTC (rev 92678)
+++ z3ext.layout/trunk/src/z3ext/layout/tales.py	2008-10-29 18:21:44 UTC (rev 92679)
@@ -50,6 +50,8 @@
             view = queryMultiAdapter((context, request), iface)
             if view is not None:
                 view.update()
+                if view.isRedirected:
+                    return u''
                 return view.render()
         except Exception, err:
             log = logging.getLogger('z3ext.layout')