Return-Path: X-Original-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9726210209 for ; Tue, 17 Sep 2013 19:58:16 +0000 (UTC) Received: (qmail 36648 invoked by uid 500); 17 Sep 2013 19:57:44 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 36078 invoked by uid 500); 17 Sep 2013 19:57:33 -0000 Mailing-List: contact allura-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: allura-dev@incubator.apache.org Delivered-To: mailing list allura-commits@incubator.apache.org Received: (qmail 35878 invoked by uid 99); 17 Sep 2013 19:57:29 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Sep 2013 19:57:29 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id DE90DA540; Tue, 17 Sep 2013 19:57:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: johnsca@apache.org To: allura-commits@incubator.apache.org Date: Tue, 17 Sep 2013 19:57:48 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [21/50] git commit: [#6545] [#5907] use status in last_post() [#6545] [#5907] use status in last_post() * we only want to show approved posts * it uses the (discussion_id, status, timestamp) index Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/192793e8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/192793e8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/192793e8 Branch: refs/heads/cj/6422 Commit: 192793e8b2d81b66b8050f40bb134444c5f6a848 Parents: 5808394 Author: Dave Brondsema Authored: Wed Sep 4 15:24:44 2013 +0000 Committer: Tim Van Steenburgh Committed: Tue Sep 10 14:31:48 2013 +0000 ---------------------------------------------------------------------- Allura/allura/model/discuss.py | 5 +++-- ForgeDiscussion/forgediscussion/tests/functional/test_forum.py | 5 ++--- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/192793e8/Allura/allura/model/discuss.py ---------------------------------------------------------------------- diff --git a/Allura/allura/model/discuss.py b/Allura/allura/model/discuss.py index 07a6269..e227b47 100644 --- a/Allura/allura/model/discuss.py +++ b/Allura/allura/model/discuss.py @@ -92,9 +92,10 @@ class Discussion(Artifact, ActivityObject): @LazyProperty def last_post(self): - # TODO add status: to query q = self.post_class().query.find(dict( - discussion_id=self._id))\ + discussion_id=self._id, + status='ok' + ))\ .sort('timestamp', pymongo.DESCENDING)\ .limit(1)\ .hint([('discussion_id', pymongo.ASCENDING), http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/192793e8/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py ---------------------------------------------------------------------- diff --git a/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py b/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py index 89efa7c..12238c8 100644 --- a/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py +++ b/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py @@ -353,9 +353,8 @@ class TestForum(TestController): assert r.location.startswith('http://localhost/p/test/discussion/testforum/thread/'), r.location def _check(): - # FIXME fix [#5907] - #r = self.app.get('/discussion/') - #assert 'Test Zero Posts' not in r + r = self.app.get('/discussion/') + assert 'Test Zero Posts' not in r r = self.app.get('/discussion/testforum/') assert 'Test Zero Posts' not in r