1.1 --- a/ApproveChangesSupport.py Sat Oct 15 01:45:27 2011 +0200
1.2 +++ b/ApproveChangesSupport.py Sat Oct 15 01:48:48 2011 +0200
1.3 @@ -70,12 +70,21 @@
1.4 "Return a user that can save pages with ACLs."
1.5
1.6 username = get_queued_changes_user(request)
1.7 - uid = user.getUserId(request, username)
1.8
1.9 # If the user does not exist, just return the existing user.
1.10
1.11 + return get_user(request, username) or request.user
1.12 +
1.13 +def get_user(request, username):
1.14 +
1.15 + "Return the user having the given 'username'."
1.16 +
1.17 + uid = user.getUserId(request, username)
1.18 +
1.19 + # If the user does not exist, just return None.
1.20 +
1.21 if not uid:
1.22 - return request.user
1.23 + return None
1.24
1.25 # Otherwise, return the privileged user.
1.26
1.27 @@ -101,6 +110,18 @@
1.28 return "#acl %s:read,write,delete,revert,admin All:" % (
1.29 get_page_reviewers_group(request))
1.30
1.31 +def get_user_directive(request):
1.32 +
1.33 + """
1.34 + Using the 'request', return a user directive for use in a page body in order
1.35 + to record who saved the changes originally.
1.36 + """
1.37 +
1.38 + if request.user.valid:
1.39 + return "#unapproved-user %s" % request.user.name
1.40 + else:
1.41 + return ""
1.42 +
1.43 def add_directives(body, directives):
1.44
1.45 "Add to the page 'body' the given 'directives'."