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

     2.1 --- a/PKG-INFO	Sun Oct 16 19:57:59 2011 +0200
     2.2 +++ b/PKG-INFO	Tue Feb 05 23:30:33 2013 +0100
     2.3 @@ -1,12 +1,12 @@
     2.4  Metadata-Version: 1.1
     2.5  Name: ApproveChanges
     2.6 -Version: 0.1
     2.7 +Version: 0.1.1
     2.8  Author: Paul Boddie
     2.9  Author-email: paul at boddie org uk
    2.10  Maintainer: Paul Boddie
    2.11  Maintainer-email: paul at boddie org uk
    2.12  Home-page: http://moinmo.in/ActionMarket/ApproveChanges
    2.13 -Download-url: http://moinmo.in/ActionMarket/ApproveChanges?action=AttachFile&do=view&target=ApproveChanges-0.1.tar.bz2
    2.14 +Download-url: http://moinmo.in/ActionMarket/ApproveChanges?action=AttachFile&do=view&target=ApproveChanges-0.1.1.tar.bz2
    2.15  Summary: Queue untrusted page changes for approval
    2.16  License: GPL (version 2 or later)
    2.17  Description: The ApproveChanges action for MoinMoin, along with the queue_for_review event

     3.1 --- a/README.txt	Sun Oct 16 19:57:59 2011 +0200
     3.2 +++ b/README.txt	Tue Feb 05 23:30:33 2013 +0100
     3.3 @@ -146,6 +146,14 @@
     3.4  Copyright and licence information can be found in the docs directory - see
     3.5  docs/COPYING.txt and docs/LICENCE.txt for more information.
     3.6  
     3.7 +New in ApproveChanges 0.1.1 (Changes since ApproveChanges 0.1)
     3.8 +--------------------------------------------------------------
     3.9 +
    3.10 +  * Fixed page reviewer access to changes. Many thanks to Jakub Jedelsky for
    3.11 +    pointing out an obvious bug in the access logic (checking approved users
    3.12 +    instead of reviewers) and non-functioning usage of the MoinMoin 1.9 API
    3.13 +    to access group pages.
    3.14 +
    3.15  Release Procedures
    3.16  ------------------
    3.17  

     4.1 --- a/docs/COPYING.txt	Sun Oct 16 19:57:59 2011 +0200
     4.2 +++ b/docs/COPYING.txt	Tue Feb 05 23:30:33 2013 +0100
     4.3 @@ -1,7 +1,11 @@
     4.4  Licence Agreement
     4.5  -----------------
     4.6  
     4.7 -Copyright (C) 2011 Paul Boddie <paul@boddie.org.uk>
     4.8 +Copyright (C) 2011, 2013 Paul Boddie <paul@boddie.org.uk>
     4.9 +
    4.10 +Some patches provided by the following contributors:
    4.11 +
    4.12 +Copyright (C) 2013 Jakub Jedelsky <jedelsky@master.cz>
    4.13  
    4.14  Some pieces of MoinMoin code were used in this work - typically
    4.15  pieces which demonstrate how to perform various essential tasks

     5.1 --- a/setup.py	Sun Oct 16 19:57:59 2011 +0200
     5.2 +++ b/setup.py	Tue Feb 05 23:30:33 2013 +0100
     5.3 @@ -8,6 +8,6 @@
     5.4      author       = "Paul Boddie",
     5.5      author_email = "paul@boddie.org.uk",
     5.6      url          = "http://moinmo.in/ActionMarket/ApproveChanges",
     5.7 -    version      = "0.1",
     5.8 +    version      = "0.1.1",
     5.9      py_modules   = ["ApproveChangesSupport"]
    5.10      )