1.1 --- a/ApproveChangesSupport.py Sun Oct 16 19:57:59 2011 +0200
1.2 +++ b/ApproveChangesSupport.py Tue Feb 05 23:30:33 2013 +0100
1.3 @@ -11,7 +11,8 @@
1.4 be allowed to review changes, they must be present in a different group (by
1.5 default "PageReviewersGroup").
1.6
1.7 - @copyright: 2011 by Paul Boddie <paul@boddie.org.uk>
1.8 + @copyright: 2011, 2013 by Paul Boddie <paul@boddie.org.uk>
1.9 + 2013 by Jakub Jedelsky <jedelsky@master.cz>
1.10 2003-2007 MoinMoin:ThomasWaldmann,
1.11 2003 by Gustavo Niemeyer
1.12 @license: GNU GPL (v2 or later), see COPYING.txt for details.
1.13 @@ -23,7 +24,7 @@
1.14 from MoinMoin.wikiutil import escape
1.15 import re
1.16
1.17 -__version__ = "0.1"
1.18 +__version__ = "0.1.1"
1.19
1.20 space_pattern = re.compile("(\s+)")
1.21 group_member_pattern = re.compile(ur'^ \* +(?:\[\[)?(?P<member>.+?)(?:\]\])? *$', re.MULTILINE | re.UNICODE)
1.22 @@ -42,7 +43,7 @@
1.23
1.24 def is_reviewer(request):
1.25 return request.user.valid and (
1.26 - has_member(request, get_approved_editors_group(request), request.user.name) or \
1.27 + has_member(request, get_page_reviewers_group(request), request.user.name) or \
1.28 request.user.isSuperUser())
1.29
1.30 def is_approved(request):
1.31 @@ -203,7 +204,7 @@
1.32 page.saveText(body, 0, comment=_("Added %s to the approved editors group.") % username)
1.33
1.34 # Utility classes and associated functions.
1.35 -# NOTE: These are a subset of EventAggregatorSupport.
1.36 +# NOTE: These are now present in MoinSupport which should be used in future.
1.37
1.38 class Form:
1.39
1.40 @@ -253,6 +254,6 @@
1.41 if hasattr(request.dicts, "has_member"):
1.42 return request.dicts.has_member(groupname, username)
1.43 else:
1.44 - return username in request.dicts.get(groupname, [])
1.45 + return username in request.groups.get(groupname, [])
1.46
1.47 # vim: tabstop=4 expandtab shiftwidth=4