web/views/actions.py
changeset 254 b1eda3dd844a
parent 237 3df2e0ae2eba
child 328 02abf429dd91
--- a/web/views/actions.py	Mon Dec 22 14:31:07 2008 +0100
+++ b/web/views/actions.py	Mon Dec 22 17:22:54 2008 +0100
@@ -23,7 +23,7 @@
     if accept match.
     """
     category = 'mainactions'    
-    __selectors__ = (searchstate_accept_selector,)
+    __selectors__ = (searchstate_accept,)
     search_states = ('linksearch',)
     order = 0
     
@@ -54,7 +54,7 @@
 
 class ViewAction(Action):
     category = 'mainactions'    
-    __selectors__ = (in_group_selector, searchstate_accept_selector)
+    __selectors__ = (in_group_selector, searchstate_accept)
     require_groups = ('users', 'managers')
     order = 0
     
@@ -78,8 +78,8 @@
 
 class ModifyAction(EntityAction):
     category = 'mainactions'
-    __selectors__ = (one_line_rset, searchstate_accept_selector)
-    #__selectors__ = searchstate_accept_selector,
+    __selectors__ = (one_line_rset, searchstate_accept)
+    #__selectors__ = searchstate_accept,
     schema_action = 'update'
     order = 10
     
@@ -106,7 +106,7 @@
     
 class DeleteAction(EntityAction):
     category = 'moreactions' 
-    __selectors__ = (searchstate_accept_selector,)
+    __selectors__ = (searchstate_accept,)
     schema_action = 'delete'
     order = 20
     
@@ -136,7 +136,7 @@
 class MultipleEditAction(EntityAction):
     category = 'mainactions'
     __selectors__ = (two_lines_rset, oneetyperset_selector,
-                     searchstate_accept_selector)
+                     searchstate_accept)
     schema_action = 'update'
     order = 10
     
@@ -171,7 +171,7 @@
         if not eschema.is_final() and eschema.has_perm(req, 'add'):
             return 1
         return 0
-    __selectors__ = (searchstate_selector,
+    __selectors__ = (match_search_state,
                      chainfirst(etype_rset_selector,
                                 chainall(two_lines_rset, oneetyperset_selector,
                                          has_add_perm_selector)))