# HG changeset patch # User sylvain.thenault@logilab.fr # Date 1234885226 -3600 # Node ID 482d3957836641866db85932169fadc385e8f8fa # Parent 6f867ab70e3d33736dae119373fb9b659eea845c kill ExtResourcesBoxTemplate diff -r 6f867ab70e3d -r 482d39578366 web/box.py --- a/web/box.py Tue Feb 17 14:48:10 2009 +0100 +++ b/web/box.py Tue Feb 17 16:40:26 2009 +0100 @@ -139,14 +139,6 @@ return (self.rql, {'x': self.req.user.eid}, 'x') -class ExtResourcesBoxTemplate(BoxTemplate): - """base class for boxes displaying external resources such as the RSS logo. - It should list necessary resources with the .need_resources attribute. - """ - __registerer__ = extresources_registerer - need_resources = () - - class EntityBoxTemplate(BoxTemplate): """base class for boxes related to a single entity""" __registerer__ = accepts_registerer diff -r 6f867ab70e3d -r 482d39578366 web/views/boxes.py --- a/web/views/boxes.py Tue Feb 17 14:48:10 2009 +0100 +++ b/web/views/boxes.py Tue Feb 17 16:40:26 2009 +0100 @@ -19,7 +19,7 @@ from cubicweb.selectors import any_rset, appobject_selectable, match_user_groups from cubicweb.web.htmlwidgets import BoxWidget, BoxMenu, BoxHtml, RawBoxItem -from cubicweb.web.box import BoxTemplate, ExtResourcesBoxTemplate +from cubicweb.web.box import BoxTemplate _ = unicode @@ -136,7 +136,6 @@ visible = True # enabled by default title = _('search') order = 0 - need_resources = 'SEARCH_GO' formdef = u"""
@@ -186,19 +185,22 @@ box.render(self.w) -class RSSIconBox(ExtResourcesBoxTemplate): +class RSSIconBox(BoxTemplate): """just display the RSS icon on uniform result set""" - __selectors__ = ExtResourcesBoxTemplate.__selectors__ + (appobject_selectable('components', 'rss_feed_url'),) + id = 'rss' + __selectors__ = BoxTemplate.__selectors__ + (appobject_selectable('components', 'rss_feed_url'),) - id = 'rss' order = 999 - need_resources = 'RSS_LOGO', visible = False def call(self, **kwargs): + try: + rss = self.req.external_resource('RSS_LOGO') + except KeyError: + self.error('missing RSS_LOGO external resource') + return 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'rss\n' % (html_escape(url), rss))