You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by je...@apache.org on 2014/10/08 12:38:25 UTC

git commit: [#7679] ticket:668 Don't include disabled users in users_with_role

Repository: allura
Updated Branches:
  refs/heads/je/42cc_7679 [created] 0c4699ada


[#7679] ticket:668 Don't include disabled users in users_with_role


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/0c4699ad
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/0c4699ad
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/0c4699ad

Branch: refs/heads/je/42cc_7679
Commit: 0c4699adafadf9cb4e559fe18e472d002f517f67
Parents: a0303fe
Author: Igor Bondarenko <je...@gmail.com>
Authored: Tue Oct 7 13:21:04 2014 +0000
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Tue Oct 7 13:21:04 2014 +0000

----------------------------------------------------------------------
 Allura/allura/model/project.py            | 3 ++-
 Allura/allura/tests/model/test_project.py | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/0c4699ad/Allura/allura/model/project.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/project.py b/Allura/allura/model/project.py
index 2ecb530..f164b4e 100644
--- a/Allura/allura/model/project.py
+++ b/Allura/allura/model/project.py
@@ -869,7 +869,8 @@ class Project(SearchIndexable, MappedClass, ActivityNode, ActivityObject):
         users = set()
         for role_name in role_names:
             for user in g.credentials.users_with_named_role(self.root_project._id, role_name):
-                users.add(user)
+                if not user.disabled:
+                    users.add(user)
         return list(users)
 
     def admins(self):

http://git-wip-us.apache.org/repos/asf/allura/blob/0c4699ad/Allura/allura/tests/model/test_project.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/model/test_project.py b/Allura/allura/tests/model/test_project.py
index db0c96d..d8a754f 100644
--- a/Allura/allura/tests/model/test_project.py
+++ b/Allura/allura/tests/model/test_project.py
@@ -20,6 +20,7 @@
 """
 Model tests for project
 """
+from nose import with_setup
 from nose.tools import assert_equals, assert_in
 from pylons import tmpl_context as c
 from ming.orm.ormsession import ThreadLocalORMSession
@@ -140,6 +141,7 @@ def test_set_ordinal_to_admin_tool():
         assert_equals(sm[-1].tool_name, 'admin')
 
 
+@with_setup(setUp)
 def test_users_and_roles():
     p = M.Project.query.get(shortname='test')
     sub = p.direct_subprojects[0]
@@ -148,7 +150,14 @@ def test_users_and_roles():
     assert p.users_with_role('Admin') == sub.users_with_role('Admin')
     assert p.users_with_role('Admin') == p.admins()
 
+    user = p.admins()[0]
+    user.disabled = True
+    ThreadLocalORMSession.flush_all()
+    assert p.users_with_role('Admin') == []
+    assert p.users_with_role('Admin') == p.admins()
+
 
+@with_setup(setUp)
 def test_project_disabled_users():
     p = M.Project.query.get(shortname='test')
     users = p.users()