You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2013/05/24 20:48:50 UTC
[06/15] 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/master
Commit: 3dd431842e1106e727066fac1b6d33bfb47b7525
Parents: 36234bd
Author: Igor Bondarenko <je...@gmail.com>
Authored: Wed May 1 10:45:31 2013 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
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, []))