Mercurial Mercurial > pub > hg > cubicweb / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
missed conflict stable
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Thu, 18 Feb 2010 14:06:17 +0100
branchstable
changeset 4637 3e5e5a234d09
parent 4636 edafa2343dd7
child 4638 c7d2145abf61
missed conflict
web/views/basecontrollers.py file | annotate | diff | comparison | revisions 
--- a/web/views/basecontrollers.py	Thu Feb 18 14:02:48 2010 +0100
+++ b/web/views/basecontrollers.py	Thu Feb 18 14:06:17 2010 +0100
@@ -350,12 +350,8 @@
             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