Mercurial Mercurial > pub > hg > cubicweb / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
web/views/basecontrollers.py
branchstable
changeset 4636 edafa2343dd7
parent 4629 1eeef3cbf528
parent 4557 a0571ff0cb5d
child 4637 3e5e5a234d09 
--- a/web/views/basecontrollers.py	Thu Feb 18 13:31:03 2010 +0100
+++ b/web/views/basecontrollers.py	Thu Feb 18 14:02:48 2010 +0100
@@ -350,7 +350,12 @@
             view = self._cw.vreg['views'].select(vid, req, rset=rset)
         except NoSelectableObject:
             vid = req.form.get('fallbackvid', 'noresult')
+<<<<<<< /home/syt/src/fcubicweb/cubicweb/web/views/basecontrollers.py
             view = self._cw.vreg['views'].select(vid, req, rset=rset)
+=======
+            view = self.vreg['views'].select(vid, req, rset=rset)
+        self.validate_cache(view)
+>>>>>>> /tmp/basecontrollers.py~other.stRkG5
         return self._call_view(view)
 
     @xhtmlize
cubicweb