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 04B9FDDC7 for ; Fri, 14 Dec 2012 15:03:36 +0000 (UTC) Received: (qmail 51589 invoked by uid 500); 14 Dec 2012 15:03:35 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 51513 invoked by uid 500); 14 Dec 2012 15:03:34 -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 50746 invoked by uid 99); 14 Dec 2012 15:03:30 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Dec 2012 15:03:30 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id EBA3781C885; Fri, 14 Dec 2012 15:03:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tvansteenburgh@apache.org To: allura-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [30/50] git commit: [#5437] all types of artifacts (not just tickets) should have comments included in rss feed Message-Id: <20121214150329.EBA3781C885@tyr.zones.apache.org> Date: Fri, 14 Dec 2012 15:03:29 +0000 (UTC) [#5437] all types of artifacts (not just tickets) should have comments included in rss feed It seems like the RSS feeds for discussion forums (top-level, per-forum, per-thread) don't work well with this change, but they are buggy already, so should be fixed separately. Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/e3076ece Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/e3076ece Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/e3076ece Branch: refs/heads/ph/4655 Commit: e3076ecea8ff69581f42c5766146713d4d207871 Parents: 8f3b938 Author: Dave Brondsema Authored: Thu Dec 13 20:54:09 2012 +0000 Committer: Dave Brondsema Committed: Thu Dec 13 21:20:18 2012 +0000 ---------------------------------------------------------------------- Allura/allura/model/discuss.py | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/e3076ece/Allura/allura/model/discuss.py ---------------------------------------------------------------------- diff --git a/Allura/allura/model/discuss.py b/Allura/allura/model/discuss.py index 5c1d82e..f29c425 100644 --- a/Allura/allura/model/discuss.py +++ b/Allura/allura/model/discuss.py @@ -210,10 +210,8 @@ class Thread(Artifact, ActivityObject): link = None if self.app.tool_label == 'Tickets': link = self.artifact.url() + p.url_paginated()[len(self.url()):] - if self.ref: - Feed.post(self.ref.artifact, title=p.subject, description=p.text, link=link) - return p - Feed.post(self, title=p.subject, description=p.text, link=link) + if self.ref: + Feed.post(self.primary(), title=p.subject, description=p.text, link=link) return p def post(self, text, message_id=None, parent_id=None,