changeset 2633:466093278e4d

fix documentation about groups configuration
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Thu, 03 Jul 2014 21:54:00 +0200
parents 647ee04f863e
children 85b9375a12c8
files docs/admin/configure.rst
diffstat 1 files changed, 6 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/docs/admin/configure.rst	Fri Jun 20 15:52:42 2014 +0530
+++ b/docs/admin/configure.rst	Thu Jul 03 21:54:00 2014 +0200
@@ -972,22 +972,21 @@
 ---------------------------
 The WikiGroups backend gets groups from wiki items and is used by default::
 
-    def groups(self, request):
+    def groups(self):
         from MoinMoin.datastruct import WikiGroups
-        return WikiGroups(request)
+        return WikiGroups()
 
 The ConfigGroups backend uses groups defined in the configuration file::
 
-    def groups(self, request):
+    def groups(self):
         from MoinMoin.datastruct import ConfigGroups
-        # Groups are defined here.
         groups = {u'EditorGroup': [u'AdminGroup', u'John', u'JoeDoe', u'Editor1'],
                   u'AdminGroup': [u'Admin1', u'Admin2', u'John']}
-        return ConfigGroups(request, groups)
+        return ConfigGroups(groups)
 
 CompositeGroups can use, for the most part, any combination of backends. The following is an example of using the ConfigGroups and WikiGroups backends::
 
-    def groups(self, request):
+    def groups(self):
         from MoinMoin.datastruct import ConfigGroups, WikiGroups, CompositeGroups
         groups = {u'EditorGroup': [u'AdminGroup', u'John', u'JoeDoe', u'Editor1'],
                   u'AdminGroup': [u'Admin1', u'Admin2', u'John']}
@@ -995,9 +994,7 @@
         # Here ConfigGroups and WikiGroups backends are used.
         # Note that order matters! Since ConfigGroups backend is mentioned first
         # EditorGroup will be retrieved from it, not from WikiGroups.
-        return CompositeGroups(request,
-                               ConfigGroups(request, groups),
-                               WikiGroups(request))
+        return CompositeGroups(ConfigGroups(groups), WikiGroups())
 
 
 Dict backend configuration