--- a/web/views/actions.py	Thu Jan 15 13:27:17 2009 +0100
+++ b/web/views/actions.py	Thu Jan 15 13:27:33 2009 +0100
@@ -55,7 +55,7 @@
 
 class ViewAction(Action):
     category = 'mainactions'    
-    __selectors__ = (in_group_selector, searchstate_accept)
+    __selectors__ = (match_user_group, searchstate_accept)
     require_groups = ('users', 'managers')
     order = 0
     
@@ -110,7 +110,7 @@
 
 class MultipleEditAction(EntityAction):
     category = 'mainactions'
-    __selectors__ = (two_lines_rset, oneetyperset_selector,
+    __selectors__ = (two_lines_rset, one_etype_rset,
                      searchstate_accept)
     schema_action = 'update'
     order = 10
@@ -198,7 +198,7 @@
         return 0
     __selectors__ = (match_search_state,
                      chainfirst(etype_rset_selector,
-                                chainall(two_lines_rset, oneetyperset_selector,
+                                chainall(two_lines_rset, one_etype_rset,
                                          has_add_perm_selector)))
 
     @property
@@ -219,7 +219,7 @@
 
 class UserPreferencesAction(Action):
     category = 'useractions'
-    __selectors__ = not_anonymous_selector,
+    __selectors__ = authenticated_user,
     order = 10
     
     id = 'myprefs'
@@ -231,7 +231,7 @@
 
 class UserInfoAction(Action):
     category = 'useractions'
-    __selectors__ = not_anonymous_selector,
+    __selectors__ = authenticated_user,
     order = 20
     
     id = 'myinfos'
@@ -243,7 +243,7 @@
 
 class LogoutAction(Action):
     category = 'useractions'
-    __selectors__ = not_anonymous_selector,
+    __selectors__ = authenticated_user,
     order = 30
     
     id = 'logout'
@@ -258,7 +258,7 @@
 class ManagersAction(Action):
     category = 'siteactions'
     __abstract__ = True
-    __selectors__ = in_group_selector,
+    __selectors__ = match_user_group,
     require_groups = ('managers',)
 
     def url(self):
@@ -301,7 +301,7 @@
         return self.rset.get_entity(self.row or 0, self.col or 0).actual_url()
 
 class UserPreferencesEntityAction(EntityAction):
-    __selectors__ = EntityAction.__selectors__ + (one_line_rset, in_group_selector,)
+    __selectors__ = EntityAction.__selectors__ + (one_line_rset, match_user_group,)
     require_groups = ('owners', 'managers')
     category = 'mainactions'
     accepts = ('EUser',)