# HG changeset patch # User sylvain.thenault@logilab.fr # Date 1234976801 -3600 # Node ID e3d8db01f3f54be4c10e2f433fefac5b58fc489f # Parent 78cc1682c3a4ce2427df78c9b7e92463991267f8 test_views fixes diff -r 78cc1682c3a4 -r e3d8db01f3f5 view.py --- a/view.py Wed Feb 18 17:27:08 2009 +0100 +++ b/view.py Wed Feb 18 18:06:41 2009 +0100 @@ -458,6 +458,9 @@ if not xmldecl: self._stream.xmldecl = u'' + def linkable(self): + return False + # concrete component base classes ############################################# class ReloadableMixIn(object): diff -r 78cc1682c3a4 -r e3d8db01f3f5 web/component.py --- a/web/component.py Wed Feb 18 17:27:08 2009 +0100 +++ b/web/component.py Wed Feb 18 18:06:41 2009 +0100 @@ -81,12 +81,12 @@ try: return self._page_size except AttributeError: - if 'page_size' in self.extra_kwargs: - page_size = self.extra_kwargs['page_size'] - elif 'page_size' in self.req.form: - page_size = int(self.req.form['page_size']) - else: - page_size = self.req.property_value(self.page_size_property) + page_size = self.extra_kwargs.get('page_size') + if page_size is None: + if 'page_size' in self.req.form: + page_size = int(self.req.form['page_size']) + else: + page_size = self.req.property_value(self.page_size_property) self._page_size = page_size return page_size diff -r 78cc1682c3a4 -r e3d8db01f3f5 web/views/actions.py --- a/web/views/actions.py Wed Feb 18 17:27:08 2009 +0100 +++ b/web/views/actions.py Wed Feb 18 18:06:41 2009 +0100 @@ -130,7 +130,7 @@ class ManagePermissionsAction(Action): id = 'managepermission' - __select__ = one_line_rset() & match_user_groups('managers') + __select__ = one_line_rset() & non_final_entity() & match_user_groups('managers') title = _('manage permissions') category = 'moreactions' @@ -140,8 +140,10 @@ def registered(cls, vreg): super(ManagePermissionsAction, cls).registered(vreg) if 'require_permission' in vreg.schema: - cls.__select__ |= relation_possible('require_permission', 'subject', 'EPermission', - action='add') + cls.__select__ = (one_line_rset() & non_final_entity() & + (match_user_groups('managers') + | relation_possible('require_permission', 'subject', 'EPermission', + action='add'))) return super(ManagePermissionsAction, cls).registered(vreg) def url(self): diff -r 78cc1682c3a4 -r e3d8db01f3f5 web/views/basetemplates.py --- a/web/views/basetemplates.py Wed Feb 18 17:27:08 2009 +0100 +++ b/web/views/basetemplates.py Wed Feb 18 18:06:41 2009 +0100 @@ -11,6 +11,7 @@ from logilab.mtconverter import html_escape from cubicweb import NoSelectableObject, ObjectNotFound +from cubicweb.selectors import match_kwargs from cubicweb.view import View, MainTemplate, NOINDEX, NOFOLLOW from cubicweb.utils import make_uid, UStringIO from cubicweb.web.views.baseviews import vid_from_rset @@ -480,8 +481,10 @@ class LogFormTemplate(View): id = 'logform' + __select__ = match_kwargs('id', 'title') + title = 'log in' - + def call(self, id, klass, title=True, message=True): self.req.add_css('cubicweb.login.css') self.w(u'
' % (id, klass)) diff -r 78cc1682c3a4 -r e3d8db01f3f5 web/views/euser.py --- a/web/views/euser.py Wed Feb 18 17:27:08 2009 +0100 +++ b/web/views/euser.py Wed Feb 18 18:06:41 2009 +0100 @@ -59,7 +59,7 @@ content_type = 'text/xml' def call(self): - self.w(''' + self.w(u''' '''% self.req.encoding) diff -r 78cc1682c3a4 -r e3d8db01f3f5 web/views/wfentities.py --- a/web/views/wfentities.py Wed Feb 18 17:27:08 2009 +0100 +++ b/web/views/wfentities.py Wed Feb 18 18:06:41 2009 +0100 @@ -6,6 +6,8 @@ """ __docformat__ = "restructuredtext en" +from logilab.mtconverter import html_escape + from cubicweb.selectors import implements from cubicweb.common.view import EntityView