--- a/web/form.py Wed Feb 18 10:03:26 2009 +0100
+++ b/web/form.py Wed Feb 18 10:03:58 2009 +0100
@@ -239,9 +239,7 @@
should list necessary parameters in the form to be accepted.
"""
__registerer__ = accepts_registerer
- __select__ = classmethod(match_form_params)
-
- form_params = ()
+ __select__ = match_form_params()
class EntityForm(FormMixIn, EntityView):
"""base class for forms applying on an entity (i.e. uniform result set)
--- a/web/views/basecomponents.py Wed Feb 18 10:03:26 2009 +0100
+++ b/web/views/basecomponents.py Wed Feb 18 10:03:58 2009 +0100
@@ -194,8 +194,8 @@
to be able to filter accordingly.
"""
id = 'etypenavigation'
- __select__ = classmethod(chainfirst(two_etypes_rset, match_form_params))
- form_params = ('__restrtype', '__restrtypes', '__restrrql')
+ __select__ = two_etypes_rset() | match_form_params('__restrtype', '__restrtypes',
+ '__restrrql')
visible = False # disabled by default
def call(self):
--- a/web/views/baseviews.py Wed Feb 18 10:03:26 2009 +0100
+++ b/web/views/baseviews.py Wed Feb 18 10:03:58 2009 +0100
@@ -35,7 +35,7 @@
class NullView(AnyRsetView):
"""default view when no result has been found"""
id = 'null'
- __select__ = classmethod(yes)
+ __select__ = yes()
def call(self, **kwargs):
pass
cell_call = call
--- a/web/views/facets.py Wed Feb 18 10:03:26 2009 +0100
+++ b/web/views/facets.py Wed Feb 18 10:03:58 2009 +0100
@@ -30,8 +30,8 @@
"""filter results of a query"""
id = 'filter_box'
__select__ = (((non_final_entity() & two_lines_rset())
- | contextview_selector
- ) & match_context_prop)
+ | contextview_selector()
+ ) & match_context_prop())
context = 'left'
title = _('boxes_filter_box')
visible = True # functionality provided by the search box by default