--- a/common/appobject.py Fri Dec 19 14:55:00 2008 +0100
+++ b/common/appobject.py Fri Dec 19 15:16:09 2008 +0100
@@ -19,7 +19,7 @@
from cubicweb.common.utils import UStringIO
from cubicweb.common.uilib import html_escape, ustrftime
from cubicweb.common.registerers import yes_registerer, priority_registerer
-from cubicweb.common.selectors import yes_selector
+from cubicweb.common.selectors import yes
_MARKER = object()
@@ -441,7 +441,7 @@
"""simple mixin for component object"""
__registry__ = 'components'
__registerer__ = yes_registerer
- __selectors__ = (yes_selector,)
+ __selectors__ = (yes,)
__select__ = classmethod(*__selectors__)
def div_class(self):
--- a/common/entity.py Fri Dec 19 14:55:00 2008 +0100
+++ b/common/entity.py Fri Dec 19 15:16:09 2008 +0100
@@ -17,7 +17,7 @@
from cubicweb.rset import ResultSet
from cubicweb.common.appobject import AppRsetObject
from cubicweb.common.registerers import id_registerer
-from cubicweb.common.selectors import yes_selector
+from cubicweb.common.selectors import yes
from cubicweb.common.uilib import printable_value, html_escape, soup2xhtml
from cubicweb.common.mixins import MI_REL_TRIGGERS
from cubicweb.common.mttransforms import ENGINE
@@ -218,7 +218,7 @@
__metaclass__ = metaentity
__registry__ = 'etypes'
__registerer__ = id_registerer
- __selectors__ = (yes_selector,)
+ __selectors__ = (yes,)
widgets = {}
id = None
e_schema = None
--- a/common/selectors.py Fri Dec 19 14:55:00 2008 +0100
+++ b/common/selectors.py Fri Dec 19 15:16:09 2008 +0100
@@ -191,7 +191,7 @@
# not so basic selectors ######################################################
@lltrace
-def etype_accepts(cls, req, *args, **kwargs):
+def accept_etype(cls, req, *args, **kwargs):
"""check etype presence in request form *and* accepts conformance"""
if 'etype' not in req.form and 'etype' not in kwargs:
return 0
@@ -209,7 +209,7 @@
return 0
# exact match must return a greater value than 'Any'-match
return 2
-etype_form_selector = deprecated_function(etype_accepts)
+etype_form_selector = deprecated_function(accept_etype)
@lltrace
def _nfentity_selector(cls, req, rset, row=None, col=None, **kwargs):
@@ -315,9 +315,10 @@
return 1
@lltrace
-def accept_rset_selector(cls, req, rset, row=None, col=None, **kwargs):
+def accept_rset(cls, req, rset, row=None, col=None, **kwargs):
"""simply delegate to cls.accept_rset method"""
return cls.accept_rset(req, rset, row=row, col=col)
+accept_rset_selector = deprecated_function(accept_rset)
@lltrace
def but_etype_selector(cls, req, rset, row=None, col=None, **kwargs):
@@ -356,6 +357,7 @@
return 0
return 1
+@lltrace
def has_related_entities(cls, req, rset, row=None, col=None, **kwargs):
assert row is not None
return bool(rset.get_entity(row, col).related(cls.rtype, role(cls)))
@@ -447,22 +449,25 @@
# compound selectors ##########################################################
-nfentity_selector = chainall(anyrset_selector, _nfentity_selector)
-interface_selector = chainall(nfentity_selector, _interface_selector)
+nfentity_selector = chainall(nonempty_rset, _nfentity_selector)
+
+implement_interface = chainall(nfentity_selector, _interface_selector)
+interface_selector = deprecated_function(implement_interface)
-accept_selector = chainall(nfentity_selector, accept_rset_selector)
-accept_one_selector = chainall(onelinerset_selector, accept_selector)
+accept = chainall(nfentity_selector, accept_rset_selector)
+accept_selector = deprecated_function(accept)
-rqlcondition_selector = chainall(nfentity_selector,
- onelinerset_selector,
+accept_one_selector = chainall(one_line_rset, accept_selector)
+
+rqlcondition_selector = chainall(nfentity_selector, one_line_rset,
_rqlcondition_selector)
-searchstate_accept_selector = chainall(anyrset_selector, searchstate_selector,
+searchstate_accept_selector = chainall(nonempty_rset, searchstate_selector,
accept_selector)
-searchstate_accept_one_selector = chainall(anyrset_selector, searchstate_selector,
+searchstate_accept_one_selector = chainall(nonempty_rset, searchstate_selector,
accept_selector, rqlcondition_selector)
searchstate_accept_one_but_etype_selector = chainall(searchstate_accept_one_selector,
but_etype_selector)
-__all__ = [name for name in globals().keys() if name.endswith('selector')]
-__all__ += ['chainall', 'chainfirst']
+#__all__ = [name for name in globals().keys() if name.endswith('selector')]
+#__all__ += ['chainall', 'chainfirst']
--- a/common/view.py Fri Dec 19 14:55:00 2008 +0100
+++ b/common/view.py Fri Dec 19 15:16:09 2008 +0100
@@ -13,9 +13,9 @@
from cubicweb import NotAnEntity, NoSelectableObject
from cubicweb.common.registerers import accepts_registerer, priority_registerer
-from cubicweb.common.selectors import (in_group_selector, anyrset_selector,
- emptyrset_selector, accept_selector,
- norset_selector, chainfirst)
+from cubicweb.common.selectors import (in_group_selector, nonempty_rset,
+ empty_rset, accept_selector,
+ none_rset, chainfirst)
from cubicweb.common.appobject import AppRsetObject, ComponentMixIn
from cubicweb.common.utils import UStringIO, HTMLStream
@@ -323,7 +323,7 @@
to be displayed (so they can always be displayed !)
"""
__registerer__ = priority_registerer
- __selectors__ = (in_group_selector, norset_selector)
+ __selectors__ = (in_group_selector, none_rset)
require_groups = ()
category = 'startupview'
@@ -345,7 +345,7 @@
result set (usually a default rql is provided by the view class)
"""
__registerer__ = accepts_registerer
- __selectors__ = (chainfirst(norset_selector, accept_selector),)
+ __selectors__ = (chainfirst(none_rset, accept_selector),)
default_rql = None
@@ -381,7 +381,7 @@
class AnyRsetView(View):
"""base class for views applying on any non empty result sets"""
__registerer__ = priority_registerer
- __selectors__ = (anyrset_selector,)
+ __selectors__ = (nonempty_rset,)
category = 'anyrsetview'
@@ -389,7 +389,7 @@
class EmptyRsetView(View):
"""base class for views applying on any empty result sets"""
__registerer__ = priority_registerer
- __selectors__ = (emptyrset_selector,)
+ __selectors__ = (empty_rset,)
# concrete template base classes ##############################################
--- a/goa/appobjects/components.py Fri Dec 19 14:55:00 2008 +0100
+++ b/goa/appobjects/components.py Fri Dec 19 15:16:09 2008 +0100
@@ -14,7 +14,7 @@
from cubicweb import typed_eid
from cubicweb.schema import display_name
from cubicweb.common.view import StartupView, EntityView
-from cubicweb.common.selectors import (onelinerset_selector, searchstate_selector,
+from cubicweb.common.selectors import (one_line_rset, searchstate_selector,
accept_selector)
from cubicweb.web import Redirect
from cubicweb.web.views import vid_from_rset
@@ -31,7 +31,7 @@
"""
id = 'search-associate'
- __selectors__ = (onelinerset_selector, searchstate_selector, accept_selector)
+ __selectors__ = (one_line_rset, searchstate_selector, accept_selector)
accepts = ('Any',)
search_states = ('linksearch',)
--- a/server/hooksmanager.py Fri Dec 19 14:55:00 2008 +0100
+++ b/server/hooksmanager.py Fri Dec 19 15:16:09 2008 +0100
@@ -183,7 +183,7 @@
from cubicweb.vregistry import autoselectors
from cubicweb.common.appobject import AppObject
from cubicweb.common.registerers import accepts_registerer, yes_registerer
-from cubicweb.common.selectors import yes_selector
+from cubicweb.common.selectors import yes
class autoid(autoselectors):
"""metaclass to create an unique 'id' attribute on the class using it"""
@@ -196,7 +196,7 @@
__metaclass__ = autoid
__registry__ = 'hooks'
__registerer__ = accepts_registerer
- __selectors__ = (yes_selector,)
+ __selectors__ = (yes,)
# set this in derivated classes
events = None
accepts = None
--- a/web/box.py Fri Dec 19 14:55:00 2008 +0100
+++ b/web/box.py Fri Dec 19 15:16:09 2008 +0100
@@ -13,7 +13,7 @@
from cubicweb.common.registerers import (accepts_registerer,
extresources_registerer,
etype_rtype_priority_registerer)
-from cubicweb.common.selectors import (etype_rtype_selector, onelinerset_selector,
+from cubicweb.common.selectors import (etype_rtype_selector, one_line_rset,
accept_selector, accept_rtype_selector,
primaryview_selector, contextprop_selector,
_rqlcondition_selector)
@@ -150,7 +150,7 @@
class EntityBoxTemplate(BoxTemplate):
"""base class for boxes related to a single entity"""
__registerer__ = accepts_registerer
- __selectors__ = (onelinerset_selector, primaryview_selector,
+ __selectors__ = (one_line_rset, primaryview_selector,
contextprop_selector, etype_rtype_selector,
accept_rtype_selector, accept_selector,
_rqlcondition_selector)
--- a/web/component.py Fri Dec 19 14:55:00 2008 +0100
+++ b/web/component.py Fri Dec 19 15:16:09 2008 +0100
@@ -10,7 +10,7 @@
from cubicweb.common.utils import merge_dicts
from cubicweb.common.view import VComponent, SingletonVComponent
from cubicweb.common.registerers import action_registerer
-from cubicweb.common.selectors import (largerset_selector, onelinerset_selector,
+from cubicweb.common.selectors import (paginated_rset, one_line_rset,
etype_rtype_selector, rqlcondition_selector,
accept_selector, contextprop_selector,
primaryview_selector, accept_rtype_selector)
@@ -32,7 +32,7 @@
__registry__ = 'contentnavigation'
__registerer__ = action_registerer
- __selectors__ = (onelinerset_selector, primaryview_selector,
+ __selectors__ = (one_line_rset, primaryview_selector,
contextprop_selector, etype_rtype_selector,
accept_rtype_selector, accept_selector,
rqlcondition_selector)
@@ -61,7 +61,7 @@
class NavigationComponent(VComponent):
"""abstract base class for navigation components"""
- __selectors__ = (largerset_selector,)
+ __selectors__ = (paginated_rset,)
id = 'navigation'
page_size_property = 'navigation.page-size'
start_param = '__start'
@@ -135,7 +135,7 @@
class RelatedObjectsVComponent(EntityVComponent):
"""a section to display some related entities"""
- __selectors__ = (onelinerset_selector, primaryview_selector,
+ __selectors__ = (one_line_rset, primaryview_selector,
etype_rtype_selector, accept_rtype_selector,
contextprop_selector, accept_selector)
vid = 'list'
--- a/web/views/actions.py Fri Dec 19 14:55:00 2008 +0100
+++ b/web/views/actions.py Fri Dec 19 15:16:09 2008 +0100
@@ -78,7 +78,7 @@
class ModifyAction(EntityAction):
category = 'mainactions'
- __selectors__ = (onelinerset_selector, searchstate_accept_selector)
+ __selectors__ = (one_line_rset, searchstate_accept_selector)
#__selectors__ = searchstate_accept_selector,
schema_action = 'update'
order = 10
@@ -135,7 +135,7 @@
class MultipleEditAction(EntityAction):
category = 'mainactions'
- __selectors__ = (twolinerset_selector, oneetyperset_selector,
+ __selectors__ = (two_lines_rset, oneetyperset_selector,
searchstate_accept_selector)
schema_action = 'update'
order = 10
@@ -173,7 +173,7 @@
return 0
__selectors__ = (searchstate_selector,
chainfirst(etype_rset_selector,
- chainall(twolinerset_selector, oneetyperset_selector,
+ chainall(two_lines_rset, oneetyperset_selector,
has_add_perm_selector)))
order = 40
id = 'addentity'
@@ -214,7 +214,7 @@
return self.build_url(self.id)
class UserPreferencesEntityAction(EntityAction):
- __selectors__ = EntityAction.__selectors__ + (onelinerset_selector, in_group_selector,)
+ __selectors__ = EntityAction.__selectors__ + (one_line_rset, in_group_selector,)
require_groups = ('owners', 'managers')
category = 'mainactions'
accepts = ('EUser',)
@@ -273,7 +273,7 @@
class ViewSchemaAction(Action):
category = 'siteactions'
- __selectors__ = yes_selector,
+ __selectors__ = yes,
order = 30
id = 'schema'
--- a/web/views/basecomponents.py Fri Dec 19 14:55:00 2008 +0100
+++ b/web/views/basecomponents.py Fri Dec 19 15:16:09 2008 +0100
@@ -14,7 +14,7 @@
from cubicweb import Unauthorized
from cubicweb.common.uilib import html_escape, toggle_action
-from cubicweb.common.selectors import yes_selector, nfentity_selector, onelinerset_selector
+from cubicweb.common.selectors import yes, nfentity_selector, one_line_rset
from cubicweb.schema import display_name
from cubicweb.common.selectors import (chainfirst, multitype_selector,
req_form_params_selector)
@@ -114,7 +114,7 @@
"""display application's messages given using the __message parameter
into a special div section
"""
- __selectors__ = yes_selector,
+ __selectors__ = yes,
id = 'applmessages'
site_wide = True # don't want user to hide this component using an eproperty
@@ -245,7 +245,7 @@
class RSSEntityFeedURL(VComponent):
id = 'rss_feed_url'
- __selectors__ = (nfentity_selector, onelinerset_selector)
+ __selectors__ = (nfentity_selector, one_line_rset)
def feed_url(self):
return self.entity(0, 0).rss_feed_url()
--- a/web/views/basecontrollers.py Fri Dec 19 14:55:00 2008 +0100
+++ b/web/views/basecontrollers.py Fri Dec 19 15:16:09 2008 +0100
@@ -18,7 +18,7 @@
from logilab.common.decorators import cached
from cubicweb import NoSelectableObject, ValidationError, typed_eid
-from cubicweb.common.selectors import yes_selector
+from cubicweb.common.selectors import yes
from cubicweb.common.mail import format_mail
from cubicweb.common.view import STRICT_DOCTYPE, CW_XHTML_EXTENSIONS
@@ -505,7 +505,7 @@
class MailBugReportController(SendMailController):
id = 'reportbug'
- __selectors__ = (yes_selector,)
+ __selectors__ = (yes,)
def publish(self, rset=None):
body = self.req.form['description']
--- a/web/views/baseforms.py Fri Dec 19 14:55:00 2008 +0100
+++ b/web/views/baseforms.py Fri Dec 19 15:16:09 2008 +0100
@@ -18,7 +18,7 @@
from cubicweb.common.utils import make_uid
from cubicweb.common.uilib import cut
from cubicweb.common.selectors import (etype_form_selector, kwargs_selector,
- onelinerset_selector, interface_selector,
+ one_line_rset, interface_selector,
req_form_params_selector, accept_selector)
from cubicweb.common.view import EntityView
from cubicweb.web import INTERNAL_FIELD_VALUE, stdmsgs, eid_param
@@ -216,7 +216,7 @@
dynamic default values such as the 'tomorrow' date or the user's login
being connected
"""
- __selectors__ = (onelinerset_selector, accept_selector)
+ __selectors__ = (one_line_rset, accept_selector)
id = 'edition'
title = _('edition')
--- a/web/views/baseviews.py Fri Dec 19 14:55:00 2008 +0100
+++ b/web/views/baseviews.py Fri Dec 19 15:16:09 2008 +0100
@@ -21,8 +21,8 @@
from logilab.mtconverter import html_escape, TransformError
from cubicweb import Unauthorized, NoSelectableObject, typed_eid
-from cubicweb.common.selectors import (yes_selector, anyrset_selector, accept_selector,
- onelinerset_selector, searchstate_selector,
+from cubicweb.common.selectors import (yes, nonempty_rset, accept_selector,
+ one_line_rset, searchstate_selector,
req_form_params_selector, accept_rset_selector)
from cubicweb.common.uilib import (cut, printable_value, UnicodeCSVWriter,
ajax_replace_url, rql_for_eid)
@@ -36,7 +36,7 @@
class NullView(AnyRsetView):
"""default view when no result has been found"""
id = 'null'
- __select__ = classmethod(yes_selector)
+ __select__ = classmethod(yes)
def call(self, **kwargs):
pass
cell_call = call
@@ -761,7 +761,7 @@
"""
id = 'search-associate'
title = _('search for association')
- __selectors__ = (onelinerset_selector, searchstate_selector, accept_selector)
+ __selectors__ = (one_line_rset, searchstate_selector, accept_selector)
accepts = ('Any',)
search_states = ('linksearch',)
--- a/web/views/calendar.py Fri Dec 19 14:55:00 2008 +0100
+++ b/web/views/calendar.py Fri Dec 19 15:16:09 2008 +0100
@@ -15,7 +15,7 @@
from cubicweb.interfaces import ICalendarable
from cubicweb.common.utils import date_range
from cubicweb.common.uilib import ajax_replace_url
-from cubicweb.common.selectors import interface_selector, anyrset_selector
+from cubicweb.common.selectors import interface_selector
from cubicweb.common.registerers import priority_registerer
from cubicweb.common.view import EntityView
@@ -146,7 +146,7 @@
class OneMonthCal(EntityView):
"""At some point, this view will probably replace ampm calendars"""
__registerer__ = priority_registerer
- __selectors__ = (interface_selector, anyrset_selector)
+ __selectors__ = (interface_selector, )
accepts_interfaces = (ICalendarable,)
need_navigation = False
id = 'onemonthcal'
@@ -331,7 +331,7 @@
class OneWeekCal(EntityView):
"""At some point, this view will probably replace ampm calendars"""
__registerer__ = priority_registerer
- __selectors__ = (interface_selector, anyrset_selector)
+ __selectors__ = (interface_selector, )
accepts_interfaces = (ICalendarable,)
need_navigation = False
id = 'oneweekcal'
--- a/web/views/embedding.py Fri Dec 19 14:55:00 2008 +0100
+++ b/web/views/embedding.py Fri Dec 19 15:16:09 2008 +0100
@@ -17,7 +17,7 @@
from cubicweb import urlquote # XXX should use view.url_quote method
from cubicweb.interfaces import IEmbedable
from cubicweb.common.uilib import soup2xhtml
-from cubicweb.common.selectors import (onelinerset_selector, score_entity_selector,
+from cubicweb.common.selectors import (one_line_rset, score_entity_selector,
searchstate_selector, interface_selector)
from cubicweb.common.view import NOINDEX, NOFOLLOW
from cubicweb.web.controller import Controller
@@ -81,7 +81,7 @@
"""
id = 'embed'
controller = 'embed'
- __selectors__ = (onelinerset_selector, searchstate_selector,
+ __selectors__ = (one_line_rset, searchstate_selector,
interface_selector, score_entity_selector)
accepts_interfaces = (IEmbedable,)
--- a/web/views/facets.py Fri Dec 19 14:55:00 2008 +0100
+++ b/web/views/facets.py Fri Dec 19 15:16:09 2008 +0100
@@ -11,8 +11,8 @@
from logilab.mtconverter import html_escape
from cubicweb.common.selectors import (chainfirst, chainall, nfentity_selector,
- twolinerset_selector, contextprop_selector,
- yes_selector, one_has_relation_selector)
+ two_lines_rset, contextprop_selector,
+ yes, one_has_relation_selector)
from cubicweb.web.box import BoxTemplate
from cubicweb.web.facet import (AbstractFacet, VocabularyFacet, FacetStringWidget,
RelationFacet, prepare_facets_rqlst, filter_hiddens)
@@ -28,7 +28,7 @@
"""filter results of a query"""
id = 'filter_box'
__selectors__ = (chainfirst(contextview_selector,
- chainall(nfentity_selector, twolinerset_selector)),
+ chainall(nfentity_selector, two_lines_rset)),
contextprop_selector)
context = 'left'
title = _('boxes_filter_box')
@@ -129,7 +129,7 @@
# inherit from RelationFacet to benefit from its possible_values implementation
class ETypeFacet(RelationFacet):
id = 'etype-facet'
- __selectors__ = (yes_selector,)
+ __selectors__ = (yes,)
order = 1
rtype = 'is'
target_attr = 'name'
--- a/web/views/ibreadcrumbs.py Fri Dec 19 14:55:00 2008 +0100
+++ b/web/views/ibreadcrumbs.py Fri Dec 19 15:16:09 2008 +0100
@@ -9,7 +9,7 @@
from logilab.mtconverter import html_escape
from cubicweb.interfaces import IBreadCrumbs
-from cubicweb.common.selectors import (contextprop_selector, onelinerset_selector,
+from cubicweb.common.selectors import (contextprop_selector, one_line_rset,
interface_selector)
from cubicweb.common.view import EntityView
from cubicweb.common.uilib import cut
@@ -29,7 +29,7 @@
# register msg not generated since no entity implements IPrevNext in cubicweb itself
title = _('contentnavigation_breadcrumbs')
help = _('contentnavigation_breadcrumbs_description')
- __selectors__ = (onelinerset_selector, contextprop_selector, interface_selector)
+ __selectors__ = (one_line_rset, contextprop_selector, interface_selector)
accepts_interfaces = (IBreadCrumbs,)
context = 'navtop'
order = 5
@@ -73,7 +73,7 @@
class BreadCrumbComponent(BreadCrumbEntityVComponent):
__registry__ = 'components'
- __selectors__ = (onelinerset_selector, interface_selector)
+ __selectors__ = (one_line_rset, interface_selector)
visible = True
--- a/web/views/idownloadable.py Fri Dec 19 14:55:00 2008 +0100
+++ b/web/views/idownloadable.py Fri Dec 19 15:16:09 2008 +0100
@@ -10,7 +10,7 @@
from cubicweb.interfaces import IDownloadable
from cubicweb.common.mttransforms import ENGINE
-from cubicweb.common.selectors import (onelinerset_selector, score_entity_selector,
+from cubicweb.common.selectors import (one_line_rset, score_entity_selector,
interface_selector)
from cubicweb.web.views import baseviews
@@ -33,7 +33,7 @@
of entities providing the necessary interface
"""
id = 'download'
- __selectors__ = (onelinerset_selector, interface_selector)
+ __selectors__ = (one_line_rset, interface_selector)
accepts_interfaces = (IDownloadable,)
templatable = False
--- a/web/views/management.py Fri Dec 19 14:55:00 2008 +0100
+++ b/web/views/management.py Fri Dec 19 15:16:09 2008 +0100
@@ -15,8 +15,8 @@
from cubicweb.common.view import AnyRsetView, StartupView, EntityView
from cubicweb.common.uilib import (html_traceback, rest_traceback, html_escape,
toggle_link)
-from cubicweb.common.selectors import (yes_selector, onelinerset_selector,
- accept_rset_selector, norset_selector,
+from cubicweb.common.selectors import (yes, one_line_rset,
+ accept_rset_selector, none_rset,
chainfirst, chainall)
from cubicweb.web import INTERNAL_FIELD_VALUE, eid_param, stdmsgs
from cubicweb.web.widgets import StaticComboBoxWidget
@@ -181,7 +181,7 @@
class ErrorView(AnyRsetView):
"""default view when no result has been found"""
- __selectors__ = (yes_selector,)
+ __selectors__ = (yes,)
id = 'error'
def page_title(self):
@@ -439,8 +439,8 @@
id = 'epropertiesform'
title = _('preferences')
require_groups = ('users', 'managers') # we don't want guests to be able to come here
- __selectors__ = chainfirst(norset_selector,
- chainall(onelinerset_selector, accept_rset_selector)),
+ __selectors__ = chainfirst(none_rset,
+ chainall(one_line_rset, accept_rset_selector)),
accepts = ('EUser',)
@classmethod
--- a/web/views/navigation.py Fri Dec 19 14:55:00 2008 +0100
+++ b/web/views/navigation.py Fri Dec 19 15:16:09 2008 +0100
@@ -11,9 +11,9 @@
from logilab.mtconverter import html_escape
from cubicweb.interfaces import IPrevNext
-from cubicweb.common.selectors import (largerset_selector, sortedrset_selector,
+from cubicweb.common.selectors import (paginated_rset, sortedrset_selector,
primaryview_selector, contextprop_selector,
- onelinerset_selector, interface_selector)
+ one_line_rset, interface_selector)
from cubicweb.common.uilib import cut
from cubicweb.web.component import EntityVComponent, NavigationComponent
@@ -49,7 +49,7 @@
"""sorted navigation apply if navigation is needed (according to page size)
and if the result set is sorted
"""
- __selectors__ = (largerset_selector, sortedrset_selector)
+ __selectors__ = (paginated_rset, sortedrset_selector)
# number of considered chars to build page links
nb_chars = 5
@@ -176,7 +176,7 @@
# itself
title = _('contentnavigation_prevnext')
help = _('contentnavigation_prevnext_description')
- __selectors__ = (onelinerset_selector, primaryview_selector,
+ __selectors__ = (one_line_rset, primaryview_selector,
contextprop_selector, interface_selector)
accepts_interfaces = (IPrevNext,)
context = 'navbottom'
--- a/web/views/tableview.py Fri Dec 19 14:55:00 2008 +0100
+++ b/web/views/tableview.py Fri Dec 19 15:16:09 2008 +0100
@@ -14,7 +14,7 @@
from cubicweb.common.utils import make_uid
from cubicweb.common.uilib import toggle_action, limitsize, jsonize, htmlescape
from cubicweb.common.view import EntityView, AnyRsetView
-from cubicweb.common.selectors import (anyrset_selector, req_form_params_selector,
+from cubicweb.common.selectors import (nonempty_rset, req_form_params_selector,
accept_rset_selector)
from cubicweb.web.htmlwidgets import (TableWidget, TableColumn, MenuWidget,
PopupBoxMenu, BoxLink)
@@ -249,7 +249,7 @@
class CellView(EntityView):
- __selectors__ = (anyrset_selector, accept_rset_selector)
+ __selectors__ = (nonempty_rset, accept_rset_selector)
id = 'cell'
accepts = ('Any',)
@@ -285,7 +285,7 @@
displayed with default restrictions set
"""
id = 'initialtable'
- __selectors__ = anyrset_selector, req_form_params_selector
+ __selectors__ = nonempty_rset, req_form_params_selector
form_params = ('actualrql',)
# should not be displayed in possible view since it expects some specific
# parameters
--- a/web/views/timetable.py Fri Dec 19 14:55:00 2008 +0100
+++ b/web/views/timetable.py Fri Dec 19 15:16:09 2008 +0100
@@ -9,7 +9,7 @@
from cubicweb.interfaces import ITimetableViews
from cubicweb.common.utils import date_range
-from cubicweb.common.selectors import interface_selector, anyrset_selector
+from cubicweb.common.selectors import interface_selector
from cubicweb.common.view import AnyRsetView
@@ -25,7 +25,7 @@
class TimeTableView(AnyRsetView):
id = 'timetable'
title = _('timetable')
- __selectors__ = (interface_selector, anyrset_selector)
+ __selectors__ = (interface_selector,)
accepts_interfaces = (ITimetableViews,)
need_navigation = False
--- a/web/views/treeview.py Fri Dec 19 14:55:00 2008 +0100
+++ b/web/views/treeview.py Fri Dec 19 15:16:09 2008 +0100
@@ -1,7 +1,7 @@
from logilab.mtconverter import html_escape
from cubicweb.interfaces import ITree
-from cubicweb.common.selectors import interface_selector, yes_selector
+from cubicweb.common.selectors import interface_selector, yes
from cubicweb.common.view import EntityView
from cubicweb.web.views.baseviews import OneLineView
@@ -85,9 +85,9 @@
(each item should be exandable if it's not a tree leaf)
"""
id = 'treeitemview'
- # XXX append yes_selector to make sure we get an higher score than
+ # XXX append yes to make sure we get an higher score than
# the default treeitem view
- __selectors__ = (interface_selector, yes_selector)
+ __selectors__ = (interface_selector, yes)
accepts_interfaces = (ITree,)
def cell_call(self, row, col, vid='oneline', parentvid='treeview'):