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 2017/03/04 19:21:47 UTC
allura git commit: [#8073] pending user cant be granted permissions
Repository: allura
Updated Branches:
refs/heads/master 0a35e62cc -> 54822f6ac
[#8073] pending user cant be granted permissions
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/54822f6a
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/54822f6a
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/54822f6a
Branch: refs/heads/master
Commit: 54822f6ac5bb054553f20cc14f157a88652b56f9
Parents: 0a35e62
Author: huzaifafaruqui <hu...@outlook.com>
Authored: Sat Mar 4 15:38:23 2017 +0530
Committer: huzaifafaruqui <hu...@outlook.com>
Committed: Sat Mar 4 15:38:23 2017 +0530
----------------------------------------------------------------------
Allura/allura/ext/admin/admin_main.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/54822f6a/Allura/allura/ext/admin/admin_main.py
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/admin_main.py b/Allura/allura/ext/admin/admin_main.py
index 44c34df..e683ae6 100644
--- a/Allura/allura/ext/admin/admin_main.py
+++ b/Allura/allura/ext/admin/admin_main.py
@@ -1164,7 +1164,8 @@ class GroupsController(BaseController):
if not username or username == '*anonymous':
return dict(error='You must choose a user to add.')
group = M.ProjectRole.query.get(_id=ObjectId(role_id))
- user = M.User.by_username(username.strip())
+ user = M.User.query.get(username=username.strip(), pending=False)
+
if not group:
return dict(error='Could not find group with id %s' % role_id)
if not user: