You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by he...@apache.org on 2015/04/01 23:10:25 UTC
[08/45] allura git commit: [#7841] ticket:742 Hide disabled and
pending authors from wiki pages
[#7841] ticket:742 Hide disabled and pending authors from wiki pages
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/e887dfb5
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/e887dfb5
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/e887dfb5
Branch: refs/heads/hss/7072
Commit: e887dfb590badea3d6f893ae17c12a256eeac0c6
Parents: 269703c
Author: Aleksey 'LXj' Alekseyev <go...@gmail.com>
Authored: Wed Mar 18 00:13:19 2015 +0200
Committer: Heith Seewald <hs...@slashdotmedia.com>
Committed: Thu Mar 19 14:51:21 2015 -0400
----------------------------------------------------------------------
ForgeWiki/forgewiki/model/wiki.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/e887dfb5/ForgeWiki/forgewiki/model/wiki.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/model/wiki.py b/ForgeWiki/forgewiki/model/wiki.py
index 18bfb85..c79fd16 100644
--- a/ForgeWiki/forgewiki/model/wiki.py
+++ b/ForgeWiki/forgewiki/model/wiki.py
@@ -234,7 +234,11 @@ class Page(VersionedArtifact, ActivityObject):
t[user.username] = user.id
return t.values()
user_ids = uniq([r.author for r in self.history().all()])
- return User.query.find({'_id': {'$in': user_ids}}).all()
+ return User.query.find({
+ '_id': {'$in': user_ids},
+ 'disabled': False,
+ 'pending': False
+ }).all()
def delete(self):
Shortlink.query.remove(dict(ref_id=self.index_id()))