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 7F3C010B63 for ; Wed, 24 Apr 2013 17:16:13 +0000 (UTC) Received: (qmail 59133 invoked by uid 500); 24 Apr 2013 17:16:13 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 59112 invoked by uid 500); 24 Apr 2013 17:16:13 -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 59104 invoked by uid 99); 24 Apr 2013 17:16:13 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Apr 2013 17:16:13 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5519E823DCF; Wed, 24 Apr 2013 17:16:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brondsem@apache.org To: allura-commits@incubator.apache.org Date: Wed, 24 Apr 2013 17:16:36 -0000 Message-Id: <3fa43ca41ec44b138af27b253ca2b44d@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [27/28] git commit: [#2835] ticket:304 Use new version of url_paginated instead of slicing trick [#2835] ticket:304 Use new version of url_paginated instead of slicing trick Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/57cf03a7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/57cf03a7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/57cf03a7 Branch: refs/heads/db/2835 Commit: 57cf03a77b0ca0cb5d291659942a6b23bb071188 Parents: a7840ce Author: Igor Bondarenko Authored: Thu Apr 4 12:15:04 2013 +0000 Committer: Dave Brondsema Committed: Wed Apr 24 16:34:43 2013 +0000 ---------------------------------------------------------------------- Allura/allura/model/discuss.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/57cf03a7/Allura/allura/model/discuss.py ---------------------------------------------------------------------- diff --git a/Allura/allura/model/discuss.py b/Allura/allura/model/discuss.py index fe79820..d169e1b 100644 --- a/Allura/allura/model/discuss.py +++ b/Allura/allura/model/discuss.py @@ -225,8 +225,8 @@ class Thread(Artifact, ActivityObject): if not self.first_post: self.first_post_id = p._id link = None - if self.app.tool_label == 'Tickets': - link = self.artifact.url() + p.url_paginated()[len(self.url()):] + if self.app.tool_label.lower() == 'tickets': + link = p.url_paginated() if self.ref: Feed.post(self.primary(), title=p.subject, description=p.text, link=link) return p