some minor __select__ composition fixes tls-sprint
authorAdrien Di Mascio <Adrien.DiMascio@logilab.fr>
Wed, 18 Feb 2009 01:45:35 +0100
branchtls-sprint
changeset 753 17d38f000bea
parent 752 c0506c4a1e6c
child 754 937f5feac7f0
child 757 01740274e774
some minor __select__ composition fixes
web/action.py
web/views/actions.py
web/views/euser.py
--- a/web/action.py	Wed Feb 18 01:45:09 2009 +0100
+++ b/web/action.py	Wed Feb 18 01:45:35 2009 +0100
@@ -75,7 +75,7 @@
     """
     @objectify_selector
     def my_selector(cls, req, rset, row=None, col=0, **kwargs):
-        selector = (match_search_state('normal') & one_line_rset
+        selector = (match_search_state('normal') & one_line_rset()
                     & relation_possible(cls.rtype, role(cls), cls.etype,
                                         action='add')
                     & may_add_relation(cls.rtype, role(cls)))
--- a/web/views/actions.py	Wed Feb 18 01:45:09 2009 +0100
+++ b/web/views/actions.py	Wed Feb 18 01:45:35 2009 +0100
@@ -116,7 +116,7 @@
 class MultipleEditAction(Action):
     id = 'muledit' # XXX get strange conflicts if id='edit'
     __select__ = (match_search_state('normal') &
-                     two_lines_rset(), one_etype_rset() &
+                  two_lines_rset() & one_etype_rset() &
                   has_permission('update'))
 
     title = _('modify')
--- a/web/views/euser.py	Wed Feb 18 01:45:09 2009 +0100
+++ b/web/views/euser.py	Wed Feb 18 01:45:35 2009 +0100
@@ -19,7 +19,7 @@
 
 class UserPreferencesEntityAction(Action):
     id = 'prefs'
-    __select__ = (one_line_rset & implements('EUser') &
+    __select__ = (one_line_rset() & implements('EUser') &
                   match_user_groups('owners', 'managers'))
     
     title = _('preferences')