You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2012/09/21 22:18:33 UTC
[5/16] git commit: [#4445] Fixed failing test due to user var being
overwritten
[#4445] Fixed failing test due to user var being overwritten
Signed-off-by: Cory Johns <jo...@geek.net>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/f9b19689
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/f9b19689
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/f9b19689
Branch: refs/heads/master
Commit: f9b19689e171eb00d7b604edcd0f45f377ba113d
Parents: 8404edf
Author: Cory Johns <jo...@geek.net>
Authored: Fri Sep 21 17:51:23 2012 +0000
Committer: Dave Brondsema <db...@geek.net>
Committed: Fri Sep 21 18:36:16 2012 +0000
----------------------------------------------------------------------
Allura/allura/lib/plugin.py | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/f9b19689/Allura/allura/lib/plugin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/plugin.py b/Allura/allura/lib/plugin.py
index ffeb3df..bf68722 100644
--- a/Allura/allura/lib/plugin.py
+++ b/Allura/allura/lib/plugin.py
@@ -456,9 +456,9 @@ class ProjectRegistrationProvider(object):
p.acl += [M.ACE.allow(group._id, perm)
for perm in permissions]
for username in usernames:
- user = M.User.by_username(username)
- if not (user and user._id): continue
- pr = user.project_role(project=p)
+ guser = M.User.by_username(username)
+ if not (guser and user._id): continue
+ pr = guser.project_role(project=p)
if group._id not in pr.roles:
pr.roles.append(group._id)
if 'tools' in project_template: