Skip to content
This repository was archived by the owner on Jan 20, 2022. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions aldryn_forms/contrib/email_notifications/cms_plugins.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ class ExistingEmailNotificationInline(admin.StackedInline):
'to_user',
('to_name', 'to_email'),
('from_name', 'from_email'),
('reply_name', 'reply_email'),
)
}),
)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Generated by Django 2.1.5 on 2019-04-04 16:10

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('email_notifications', '0004_auto_20190104_1242'),
]

operations = [
migrations.AddField(
model_name='emailnotification',
name='reply_email',
field=models.CharField(blank=True, max_length=200, verbose_name='reply email'),
),
migrations.AddField(
model_name='emailnotification',
name='reply_name',
field=models.CharField(blank=True, max_length=200, verbose_name='reply name'),
),
]
21 changes: 20 additions & 1 deletion aldryn_forms/contrib/email_notifications/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,16 @@ class Meta:
max_length=200,
blank=True
)
reply_name = models.CharField(
verbose_name=_('reply name'),
max_length=200,
blank=True
)
reply_email = models.CharField(
verbose_name=_('reply email'),
max_length=200,
blank=True
)
subject = models.CharField(
verbose_name=_("subject"),
max_length=200,
Expand Down Expand Up @@ -208,7 +218,16 @@ def get_email_kwargs(self, form):
from_email = formataddr((from_name, from_email))

kwargs['from_email'] = from_email
kwargs['reply_to'] = [from_email]

if self.reply_email:
reply_email = render(self.reply_email)

if self.reply_name:
reply_name = render(self.reply_name)
reply_email = formataddr((reply_name, reply_email))

kwargs['reply_to'] = [reply_email]

return kwargs

def prepare_email(self, form):
Expand Down
18 changes: 18 additions & 0 deletions aldryn_forms/migrations/0013_auto_20190404_1610.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 2.1.5 on 2019-04-04 16:10

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('aldryn_forms', '0012_auto_20190104_1242'),
]

operations = [
migrations.AlterField(
model_name='formplugin',
name='action_backend',
field=models.CharField(choices=[('none', 'None'), ('default', 'Default'), ('email_only', 'Email only')], default='default', max_length=15, verbose_name='Action backend'),
),
]