incubator-allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tvansteenbu...@apache.org
Subject [20/39] git commit: [#6628] ticket:434 use generic "From address" in export emails for reply_to
Date Tue, 10 Sep 2013 15:55:16 GMT
[#6628]  ticket:434 use generic "From address" in export emails for reply_to


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/c0b098cf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/c0b098cf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/c0b098cf

Branch: refs/heads/db/6545
Commit: c0b098cf629e541d4a40116ae86c0e940877064e
Parents: e2840fe
Author: Yuriy Arhipov <yuriyarhipovua@yandex.ru>
Authored: Tue Sep 10 14:20:07 2013 +0400
Committer: Tim Van Steenburgh <tvansteenburgh@gmail.com>
Committed: Tue Sep 10 13:04:26 2013 +0000

----------------------------------------------------------------------
 Allura/allura/tasks/export_tasks.py | 2 +-
 Allura/allura/tests/test_tasks.py   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/c0b098cf/Allura/allura/tasks/export_tasks.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tasks/export_tasks.py b/Allura/allura/tasks/export_tasks.py
index 8146b0f..ecd538c 100644
--- a/Allura/allura/tasks/export_tasks.py
+++ b/Allura/allura/tasks/export_tasks.py
@@ -92,7 +92,7 @@ def _bulk_export(project, tools, user):
     }
     email = {
         'fromaddr': unicode(tg.config['forgemail.return_path']),
-        'reply_to': unicode(user.email_address_header()),
+        'reply_to': unicode(tg.config['forgemail.return_path']),
         'message_id': h.gen_message_id(),
         'destinations': [unicode(user._id)],
         'subject': u'Bulk export for project %s completed' % project.shortname,

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/c0b098cf/Allura/allura/tests/test_tasks.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_tasks.py b/Allura/allura/tests/test_tasks.py
index 9123fa3..af7898e 100644
--- a/Allura/allura/tests/test_tasks.py
+++ b/Allura/allura/tests/test_tasks.py
@@ -381,6 +381,7 @@ class TestExportTasks(unittest.TestCase):
         assert_equal(len(tasks), 1)
         assert_equal(tasks[0].kwargs['subject'], 'Bulk export for project test completed')
         assert_equal(tasks[0].kwargs['fromaddr'], 'noreply@sourceforge.net')
+        assert_equal(tasks[0].kwargs['reply_to'], 'noreply@sourceforge.net')
         text = tasks[0].kwargs['text']
         assert_in('The bulk export for project test is completed.', text)
         assert_in('The following tools were exported:\n- wiki', text)


Mime
View raw message