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.
avoid deprecation warning tls-sprint
authorsylvain.thenault@logilab.fr
Thu, 19 Feb 2009 23:32:46 +0100
branchtls-sprint
changeset 872 78f03d6a1505
parent 871 01eb42259154
child 873 3d9df99b0bfa
avoid deprecation warning
web/views/basetemplates.py file | annotate | diff | comparison | revisions
web/views/startup.py file | annotate | diff | comparison | revisions 
--- a/web/views/basetemplates.py	Thu Feb 19 23:31:43 2009 +0100
+++ b/web/views/basetemplates.py	Thu Feb 19 23:32:46 2009 +0100
@@ -112,8 +112,8 @@
         if etypefilter and etypefilter.propval('visible'):
             etypefilter.dispatch(w=w)
         self.nav_html = UStringIO()
-        self.pagination(self.req, self.rset, self.nav_html.write,
-                        not (view and view.need_navigation))
+        if view and view.need_navigation:
+            view.paginate(w=self.nav_html.write)
         w(_(self.nav_html.getvalue()))
         w(u'<div id="contentmain">\n')
         view.dispatch(w=w)
--- a/web/views/startup.py	Thu Feb 19 23:31:43 2009 +0100
+++ b/web/views/startup.py	Thu Feb 19 23:32:46 2009 +0100
@@ -9,8 +9,8 @@
 
 from logilab.mtconverter import html_escape
 
+from cubicweb.view import StartupView
 from cubicweb.common.uilib import ureport_as_html, unormalize, ajax_replace_url
-from cubicweb.common.view import StartupView
 from cubicweb.web.httpcache import EtagHTTPCacheManager
 
 _ = unicode
cubicweb