diff -r f178182b1305 -r af4d8f75c5db web/views/baseviews.py --- a/web/views/baseviews.py Tue Jul 07 13:25:24 2009 +0200 +++ b/web/views/baseviews.py Tue Jul 07 13:26:44 2009 +0200 @@ -17,7 +17,7 @@ from rql import nodes -from logilab.mtconverter import TransformError, html_escape, xml_escape +from logilab.mtconverter import TransformError, xml_escape, xml_escape from cubicweb import NoSelectableObject from cubicweb.selectors import yes, empty_rset @@ -121,8 +121,8 @@ """the one line view for an entity: linked text view """ entity = self.entity(row, col) - self.w(u'' % html_escape(entity.absolute_url())) - self.w(html_escape(self.view('text', self.rset, row=row, col=col))) + self.w(u'' % xml_escape(entity.absolute_url())) + self.w(xml_escape(self.view('text', self.rset, row=row, col=col))) self.w(u'') @@ -205,8 +205,8 @@ entity = self.entity(row, col) desc = cut(entity.dc_description(), 50) self.w(u'' % ( - html_escape(entity.absolute_url()), html_escape(desc))) - self.w(html_escape(self.view('textincontext', self.rset, + xml_escape(entity.absolute_url()), xml_escape(desc))) + self.w(xml_escape(self.view('textincontext', self.rset, row=row, col=col))) self.w(u'') @@ -218,8 +218,8 @@ entity = self.entity(row, col) desc = cut(entity.dc_description(), 50) self.w(u'' % ( - html_escape(entity.absolute_url()), html_escape(desc))) - self.w(html_escape(self.view('textoutofcontext', self.rset, + xml_escape(entity.absolute_url()), xml_escape(desc))) + self.w(xml_escape(self.view('textoutofcontext', self.rset, row=row, col=col))) self.w(u'')