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.
fix w/ template drop tls-sprint
authorsylvain.thenault@logilab.fr
Wed, 18 Feb 2009 17:22:10 +0100
branchtls-sprint
changeset 819 7fd66f389ef7
parent 816 9cd49a910fce
child 820 fcc11122ffe7
fix w/ template drop
cwconfig.py file | annotate | diff | comparison | revisions
view.py file | annotate | diff | comparison | revisions
web/views/basetemplates.py file | annotate | diff | comparison | revisions 
--- a/cwconfig.py	Wed Feb 18 17:12:52 2009 +0100
+++ b/cwconfig.py	Wed Feb 18 17:22:10 2009 +0100
@@ -59,7 +59,7 @@
 # XXX generate this according to the configuration (repository/all-in-one/web)
 VREGOPTIONS = []
 for registry in ('etypes', 'hooks', 'controllers', 'actions', 'components',
-                 'views', 'templates', 'boxes', 'contentnavigation', 'urlrewriting',
+                 'views', 'boxes', 'contentnavigation', 'urlrewriting',
                  'facets'):
     VREGOPTIONS.append(('disable-%s'%registry,
                         {'type' : 'csv', 'default': (),
--- a/view.py	Wed Feb 18 17:12:52 2009 +0100
+++ b/view.py	Wed Feb 18 17:22:10 2009 +0100
@@ -218,13 +218,13 @@
             view = self.vreg.select_view(__fallback_vid, self.req, rset, **kwargs)
         return view.dispatch(**kwargs)
     
-    # XXX Template bw compat
-    template = obsolete('.template is deprecated, use .view')(view)
-    
     def wview(self, __vid, rset, __fallback_vid=None, **kwargs):
         """shortcut to self.view method automatically passing self.w as argument
         """
         self.view(__vid, rset, __fallback_vid, w=self.w, **kwargs)
+        
+    # XXX Template bw compat
+    template = obsolete('.template is deprecated, use .view')(wview)
 
     def whead(self, data):
         self.req.html_headers.write(data)
--- a/web/views/basetemplates.py	Wed Feb 18 17:12:52 2009 +0100
+++ b/web/views/basetemplates.py	Wed Feb 18 17:22:10 2009 +0100
@@ -38,7 +38,7 @@
         w(NOINDEX)
         w(NOFOLLOW)
         w(u'\n'.join(additional_headers) + u'\n')
-        self.view('htmlheader', rset=self.rset)
+        self.wview('htmlheader', rset=self.rset)
         w(u'<title>%s</title>\n' % html_escape(page_title))
 
 
@@ -47,7 +47,7 @@
     title = 'log in'
 
     def content(self, w):
-        self.view('logform', rset=self.rset, id='loginBox', klass='')
+        self.wview('logform', rset=self.rset, id='loginBox', klass='')
 
 
 class LoggedOutTemplate(LogInOutTemplate):
@@ -128,7 +128,7 @@
             self.set_request_content_type()
             content_type = self.content_type
             self.template_header(content_type, view)
-        self.view('page-content', view=view, rset=rset)
+        self.wview('page-content', view=view, rset=rset)
         if with_templates:
             self.template_footer(view)
 
@@ -161,14 +161,14 @@
         w(u'<meta http-equiv="content-type" content="%s; charset=%s"/>\n'
           % (content_type, self.req.encoding))
         w(u'\n'.join(additional_headers) + u'\n')
-        self.view('htmlheader', rset=self.rset)
+        self.wview('htmlheader', rset=self.rset)
         if page_title:
             w(u'<title>%s</title>\n' % html_escape(page_title))
 
     def template_body_header(self, view):
         w = self.w
         w(u'<body>\n')
-        self.view('header', rset=self.rset, view=view)
+        self.wview('header', rset=self.rset, view=view)
         w(u'<div id="page"><table width="100%" border="0" id="mainLayout"><tr>\n')
         self.nav_column(view, 'left')
         w(u'<td id="contentcol">\n')
@@ -185,7 +185,7 @@
         self.w(u'</td>\n')
         self.nav_column(view, 'right')
         self.w(u'</tr></table></div>\n')
-        self.view('footer', rset=self.rset)
+        self.wview('footer', rset=self.rset)
         self.w(u'</body>')
 
     def nav_column(self, view, context):
@@ -199,10 +199,10 @@
 
     def content_header(self, view=None):
         """by default, display informal messages in content header"""
-        self.view('contentheader', rset=self.rset, view=view)
+        self.wview('contentheader', rset=self.rset, view=view)
 
     def content_footer(self, view=None):
-        self.view('contentfooter', rset=self.rset, view=view)
+        self.wview('contentfooter', rset=self.rset, view=view)
 
 
 class PageContentTemplate(TheMainTemplate):
@@ -266,7 +266,7 @@
         w(u'<meta http-equiv="content-type" content="%s; charset=%s"/>\n'
           % (content_type, self.req.encoding))
         w(u'\n'.join(additional_headers))
-        self.view('htmlheader', rset=self.rset)
+        self.wview('htmlheader', rset=self.rset)
         w(u'<title>%s</title>\n' % html_escape(page_title))
         self.w(u'<body>\n')
 
@@ -287,7 +287,7 @@
         whead(u'<meta http-equiv="content-type" content="%s; charset=%s"/>\n'
               % (content_type, self.req.encoding))
         whead(u'\n'.join(additional_headers) + u'\n')
-        self.view('htmlheader', rset=self.rset)
+        self.wview('htmlheader', rset=self.rset)
         w = self.w
         w(u'<title>%s</title>\n' % html_escape(page_title))
         w(u'<body>\n')
@@ -403,8 +403,8 @@
         self.w(u'<td id="lastcolumn">')
         self.w(u'</td>\n')
         self.w(u'</tr></table>\n')
-        self.view('logform', rset=self.rset, id='popupLoginBox', klass='hidden',
-                  title=False, message=False)
+        self.wview('logform', rset=self.rset, id='popupLoginBox', klass='hidden',
+                   title=False, message=False)
 
     def state_header(self):
         state = self.req.search_state
cubicweb