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 58D36D41E for ; Tue, 28 May 2013 16:01:13 +0000 (UTC) Received: (qmail 82430 invoked by uid 500); 28 May 2013 16:01:12 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 82366 invoked by uid 500); 28 May 2013 16:01:11 -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 80086 invoked by uid 99); 28 May 2013 16:00:56 -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, 28 May 2013 16:00:56 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E028089BB2A; Tue, 28 May 2013 16:00:55 +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, 28 May 2013 16:01:25 -0000 Message-Id: <3b55c301c8bf41fe80979970826c77e2@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [33/50] git commit: [#5656] ticket:301 Fix original ticket nums in the summary email [#5656] ticket:301 Fix original ticket nums in the summary email Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/3dd43184 Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/3dd43184 Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/3dd43184 Branch: refs/heads/cj/5913 Commit: 3dd431842e1106e727066fac1b6d33bfb47b7525 Parents: 36234bd Author: Igor Bondarenko Authored: Wed May 1 10:45:31 2013 +0000 Committer: Dave Brondsema Committed: Fri May 24 18:35:51 2013 +0000 ---------------------------------------------------------------------- ForgeTracker/forgetracker/tracker_main.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3dd43184/ForgeTracker/forgetracker/tracker_main.py ---------------------------------------------------------------------- diff --git a/ForgeTracker/forgetracker/tracker_main.py b/ForgeTracker/forgetracker/tracker_main.py index 030d168..c41db5e 100644 --- a/ForgeTracker/forgetracker/tracker_main.py +++ b/ForgeTracker/forgetracker/tracker_main.py @@ -824,8 +824,8 @@ class RootController(BaseController, FeedController): _id={'$in': [ObjectId(id) for id in ticket_ids]}, app_config_id=c.app.config._id)).all() - original_tickets = {t._id: t for t in tickets} - filtered = filtered_by_subscription(original_tickets) + filtered = filtered_by_subscription({t._id: t for t in tickets}) + original_ticket_nums = {t._id: t.ticket_num for t in tickets} users = M.User.query.find({'_id': {'$in': filtered.keys()}}).all() moved_tickets = {} for ticket in tickets: @@ -851,7 +851,7 @@ class RootController(BaseController, FeedController): } for user in users: tmpl_context['tickets'] = ({ - 'original_num': original_tickets[_id].ticket_num, + 'original_num': original_ticket_nums[_id], 'destination_num': moved_tickets[_id].ticket_num, 'summary': moved_tickets[_id].summary } for _id in filtered.get(user._id, []))