# HG changeset patch # User sylvain.thenault@logilab.fr # Date 1233332732 -3600 # Node ID 9cafff0e0620e780b256e172e7c7e1f5f1418aa0 # Parent 781cd9fccbaa2726e8b890068e21412815639b22# Parent 73aab1d2a27aca47ef7255cfa39fca5db2dbc22a merge diff -r 73aab1d2a27a -r 9cafff0e0620 devtools/testlib.py --- a/devtools/testlib.py Fri Jan 30 17:15:07 2009 +0100 +++ b/devtools/testlib.py Fri Jan 30 17:25:32 2009 +0100 @@ -206,7 +206,10 @@ elif template == 'main': _select_view_and_rset = TheMainTemplate._select_view_and_rset # patch TheMainTemplate.process_rql to avoid recomputing resultset - TheMainTemplate._select_view_and_rset = lambda *a, **k: (view, rset) + def __select_view_and_rset(self, view=view, rset=rset): + self.rset = rset + return view, rset + TheMainTemplate._select_view_and_rset = __select_view_and_rset try: return self._test_view(viewfunc, view, template, **kwargs) finally: diff -r 73aab1d2a27a -r 9cafff0e0620 web/facet.py --- a/web/facet.py Fri Jan 30 17:15:07 2009 +0100 +++ b/web/facet.py Fri Jan 30 17:25:32 2009 +0100 @@ -560,12 +560,14 @@ if self.selected: cssclass = ' facetValueSelected' imgsrc = self.req.datadir_url + self.selected_img + imgalt = self.req._('selected') else: cssclass = '' imgsrc = self.req.datadir_url + self.unselected_img + imgalt = self.req._('not selected') self.w(u'
\n' % (cssclass, html_escape(unicode(self.value)))) - self.w(u' ' % imgsrc) + self.w(u'%s ' % (imgsrc, imgalt)) self.w(u'%s' % html_escape(self.label)) self.w(u'
') diff -r 73aab1d2a27a -r 9cafff0e0620 web/views/boxes.py --- a/web/views/boxes.py Fri Jan 30 17:15:07 2009 +0100 +++ b/web/views/boxes.py Fri Jan 30 17:25:32 2009 +0100 @@ -200,7 +200,7 @@ urlgetter = self.vreg.select_component('rss_feed_url', self.req, self.rset) url = urlgetter.feed_url() rss = self.req.external_resource('RSS_LOGO') - self.w(u'\n' % (html_escape(url), rss)) + self.w(u'rss\n' % (html_escape(url), rss)) ## warning("schemabox ne marche plus pour le moment")