incubator-allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tvansteenbu...@apache.org
Subject [42/50] [abbrv] git commit: [#2502] ticket:300 Add ticket's summary for each ticket in the email
Date Tue, 23 Apr 2013 16:42:46 GMT
[#2502] ticket:300 Add ticket's summary for each ticket in the 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/25d07461
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/25d07461
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/25d07461

Branch: refs/heads/cj/5120
Commit: 25d074616b8b93fe5907835f730bc8dd68c149fa
Parents: b01ecfb
Author: Igor Bondarenko <jetmind2@gmail.com>
Authored: Wed Apr 17 10:00:14 2013 +0000
Committer: Cory Johns <cjohns@slashdotmedia.com>
Committed: Mon Apr 22 19:40:27 2013 +0000

----------------------------------------------------------------------
 ForgeTracker/forgetracker/data/mass_report         |    4 ++--
 .../forgetracker/tests/functional/test_root.py     |    6 +++---
 ForgeTracker/forgetracker/tracker_main.py          |    4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/25d07461/ForgeTracker/forgetracker/data/mass_report
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/data/mass_report b/ForgeTracker/forgetracker/data/mass_report
index 72ae642..faddde2 100644
--- a/ForgeTracker/forgetracker/data/mass_report
+++ b/ForgeTracker/forgetracker/data/mass_report
@@ -1,7 +1,7 @@
 {{ data.header }}
 
-{% for t_num, change_text in data.changes %}
-ticket: [{{ context.app.config.options.mount_point }}:#{{ t_num }}]
+{% for ticket, change_text in data.changes %}
+ticket: [{{ context.app.config.options.mount_point }}:#{{ ticket.ticket_num }}] {{ ticket.summary
}}
 
 {{ change_text }}
 {% endfor %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/25d07461/ForgeTracker/forgetracker/tests/functional/test_root.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/functional/test_root.py b/ForgeTracker/forgetracker/tests/functional/test_root.py
index c21744c..23c0890 100644
--- a/ForgeTracker/forgetracker/tests/functional/test_root.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_root.py
@@ -1148,17 +1148,17 @@ class TestFunctionalController(TrackerTestController):
 - **Milestone**: 2.0
 
 '''
-        first_ticket_changes = '''ticket: [bugs:#1]
+        first_ticket_changes = '''ticket: [bugs:#1] test first ticket
 
 - **Owner**: Anonymous --> Test Admin
 - **Status**: open --> accepted
 '''
-        second_ticket_changes = '''ticket: [bugs:#2]
+        second_ticket_changes = '''ticket: [bugs:#2] test second ticket
 
 - **Owner**: Anonymous --> Test Admin
 - **Milestone**: 1.0 --> 2.0
 '''
-        third_ticket_changes = '''ticket: [bugs:#3]
+        third_ticket_changes = '''ticket: [bugs:#3] test third ticket
 
 - **Owner**: Anonymous --> Test Admin
 - **Status**: unread --> accepted

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/25d07461/ForgeTracker/forgetracker/tracker_main.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tracker_main.py b/ForgeTracker/forgetracker/tracker_main.py
index 396d300..8d786d9 100644
--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -852,7 +852,7 @@ class RootController(BaseController):
         users = M.User.query.find({'_id': {'$in': filtered_changes.keys()}}).all()
         def changes_iter(user):
             for t_id in filtered_changes.get(user._id, []):
-                yield (changed_tickets[t_id].ticket_num, changes[t_id])
+                yield (changed_tickets[t_id], changes[t_id])
         mail = dict(
             fromaddr = str(c.user._id),
             reply_to = str(c.user._id),
@@ -889,7 +889,7 @@ class RootController(BaseController):
             monitoring_email = c.app.config.options.get('TicketMonitoringEmail')
             def all_changes():
                 for t_id in changed_tickets.keys():
-                    yield (changed_tickets[t_id].ticket_num, changes[t_id])
+                    yield (changed_tickets[t_id], changes[t_id])
             tmpl_context['data'].update({'changes': all_changes()})
             mail.update(dict(
                 message_id = h.gen_message_id(),


Mime
View raw message