# HG changeset patch
# User Aurelien Campeas <aurelien.campeas@logilab.fr>
# Date 1265978034 -3600
# Node ID 242e764696641f2a6b799331e0ed3b193e72b906
# Parent  259e7ef7c3738b506283cbd14f7cef07c8ad0820# Parent  8968c50818db50be0f8089eb2943e9760e8acde8
merge 3.5/stable heads

diff -r 8968c50818db -r 242e76469664 .hgtags
--- a/.hgtags	Fri Feb 12 12:57:14 2010 +0100
+++ b/.hgtags	Fri Feb 12 13:33:54 2010 +0100
@@ -98,3 +98,4 @@
 4920121d41f28c8075a4f00461911677396fc566 cubicweb-debian-version-3.5.11-1
 98af3d02b83e7635207781289cc3445fb0829951 cubicweb-version-3.5.12
 4281e1e2d76b9a37f38c0eeb1cbdcaa2fac6533c cubicweb-debian-version-3.5.12-1
+a0571ff0cb5da51c20a56318a2c1cb81e4a5220e 3.5
diff -r 8968c50818db -r 242e76469664 web/controller.py
--- a/web/controller.py	Fri Feb 12 12:57:14 2010 +0100
+++ b/web/controller.py	Fri Feb 12 13:33:54 2010 +0100
@@ -154,6 +154,10 @@
             rql = 'SET X %s Y where X eid %%(x)s, Y eid %%(y)s' % rtype
             execute(rql, {'x': subj, 'y': obj}, ('x', 'y'))
 
+    def validate_cache(self, view):
+        view.set_http_cache_headers()
+        self.req.validate_cache()
+
 
     def reset(self):
         """reset form parameters and redirect to a view determinated by given
diff -r 8968c50818db -r 242e76469664 web/views/basecontrollers.py
--- a/web/views/basecontrollers.py	Fri Feb 12 12:57:14 2010 +0100
+++ b/web/views/basecontrollers.py	Fri Feb 12 13:33:54 2010 +0100
@@ -142,10 +142,6 @@
         if view.add_to_breadcrumbs and not view.binary:
             self.req.update_breadcrumbs()
 
-    def validate_cache(self, view):
-        view.set_http_cache_headers()
-        self.req.validate_cache()
-
     def execute_linkto(self, eid=None):
         """XXX __linkto parameter may cause security issue
 
@@ -350,6 +346,7 @@
         except NoSelectableObject:
             vid = req.form.get('fallbackvid', 'noresult')
             view = self.vreg['views'].select(vid, req, rset=rset)
+        self.validate_cache(view)
         return self._call_view(view)
 
     @xhtmlize