diff -r 305da8d6aa2d -r 8e64f12be69c web/box.py --- a/web/box.py Mon Feb 16 20:06:18 2009 +0100 +++ b/web/box.py Mon Feb 16 20:51:24 2009 +0100 @@ -1,7 +1,7 @@ """abstract box classes for CubicWeb web client :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" @@ -14,9 +14,9 @@ accepts_registerer, extresources_registerer, etype_rtype_priority_registerer) from cubicweb.common.selectors import ( - etype_rtype_selector, one_line_rset, accept, has_relation, - primary_view, match_context_prop, has_related_entities, - _rql_condition) + one_line_rset, primary_view, match_context_prop, has_related_entities, + accept_compat) +#etype_rtype_selector, has_relation, from cubicweb.common.view import Template from cubicweb.common.appobject import ReloadableMixIn @@ -106,7 +106,7 @@ user's rights) and rql attributes """ __registerer__ = etype_rtype_priority_registerer - __selectors__ = BoxTemplate.__selectors__ + (etype_rtype_selector,) +#XXX __selectors__ = BoxTemplate.__selectors__ + (etype_rtype_selector,) rql = None @@ -151,11 +151,10 @@ """base class for boxes related to a single entity""" __registerer__ = accepts_registerer __selectors__ = (one_line_rset, primary_view, - match_context_prop, etype_rtype_selector, - has_relation, accept, _rql_condition) - accepts = ('Any',) + match_context_prop,) + #etype_rtype_selector, has_relation) + registered = accepts_compat(condition_compat(BoxTemplate.registered.im_func)) context = 'incontext' - condition = None def call(self, row=0, col=0, **kwargs): """classes inheriting from EntityBoxTemplate should define cell_call"""