incubator-allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From john...@apache.org
Subject [29/40] git commit: [#6249] ticket:464 Pass sender to direct sendmail call
Date Thu, 31 Oct 2013 21:57:40 GMT
[#6249] ticket:464 Pass sender to direct sendmail call


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

Branch: refs/heads/cj/6714
Commit: 247aa0ccdfb5c1b1a4544f0802cb1a3888df6fc2
Parents: 513eecd
Author: Igor Bondarenko <jetmind2@gmail.com>
Authored: Thu Oct 24 15:06:32 2013 +0300
Committer: Tim Van Steenburgh <tvansteenburgh@gmail.com>
Committed: Tue Oct 29 03:57:10 2013 +0000

----------------------------------------------------------------------
 Allura/allura/tasks/export_tasks.py       | 1 +
 ForgeTracker/forgetracker/model/ticket.py | 2 ++
 2 files changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/247aa0cc/Allura/allura/tasks/export_tasks.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tasks/export_tasks.py b/Allura/allura/tasks/export_tasks.py
index ecd538c..3d7f317 100644
--- a/Allura/allura/tasks/export_tasks.py
+++ b/Allura/allura/tasks/export_tasks.py
@@ -91,6 +91,7 @@ def _bulk_export(project, tools, user):
         'not_exported_tools': not_exported_tools,
     }
     email = {
+        'sender': unicode(tg.config['forgemail.return_path']),
         'fromaddr': unicode(tg.config['forgemail.return_path']),
         'reply_to': unicode(tg.config['forgemail.return_path']),
         'message_id': h.gen_message_id(),

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/247aa0cc/ForgeTracker/forgetracker/model/ticket.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/model/ticket.py b/ForgeTracker/forgetracker/model/ticket.py
index cd28e35..4ff01db 100644
--- a/ForgeTracker/forgetracker/model/ticket.py
+++ b/ForgeTracker/forgetracker/model/ticket.py
@@ -261,6 +261,7 @@ class Globals(MappedClass):
             moved = ticket.move(tracker, notify=False)
             moved_tickets[moved._id] = moved
         mail = dict(
+            sender = c.project.app_instance(self.app_config).email_address,
             fromaddr = str(c.user.email_address_header()),
             reply_to = str(c.user.email_address_header()),
             subject = '[%s:%s] Mass ticket moving by %s' % (c.project.shortname,
@@ -389,6 +390,7 @@ class Globals(MappedClass):
                 # html part of email is handled by markdown and it'll be properly escaped
                 yield (changed_tickets[t_id], jinja2.Markup(changes[t_id]))
         mail = dict(
+            sender = c.project.app_instance(self.app_config).email_address,
             fromaddr = str(c.user._id),
             reply_to = str(c.user._id),
             subject = '[%s:%s] Mass edit changes by %s' % (c.project.shortname,


Mime
View raw message