Fix email sender in password reset

eea · Jul 29, 2020 · d030098 · d030098
1 parent ebd4e2f
commit d030098
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/copernicus/settings.py b/copernicus/settings.py
@@ -245,7 +245,7 @@ def EXPLORER_PERMISSION_VIEW(u): return u.is_authenticated
                     'django.core.mail.backends.smtp.EmailBackend')
 EMAIL_HOST = env('EMAIL_HOST', 'localhost')
 EMAIL_PORT = env('EMAIL_PORT', 25)
-EMAIL_SENDER = env('EMAIL_SENDER', '')
+DEFAULT_FROM_EMAIL = env('DEFAULT_FROM_EMAIL', '')
 
 SITE_URL = env('SITE_URL', '')
 

diff --git a/docker/app.env.example b/docker/app.env.example
@@ -28,7 +28,7 @@ SUPPORT_EMAIL=
 EMAIL_BACKEND=django.core.mail.backends.smtp.EmailBackend
 EMAIL_HOST=postfix
 EMAIL_PORT=25
-EMAIL_SENDER=
+DEFAULT_FROM_EMAIL=
 
 SITE_URL=
 

diff --git a/insitu/forms.py b/insitu/forms.py
@@ -5,7 +5,7 @@
 from django.template.loader import render_to_string
 from django.utils.translation import ugettext_lazy as _
 
-from copernicus.settings import EMAIL_SENDER, SITE_URL
+from copernicus.settings import DEFAULT_FROM_EMAIL, SITE_URL
 from insitu import models
 from insitu import signals
 from picklists.models import (
@@ -521,7 +521,7 @@ def send_mail_accept_request(self, sender, receiver):
         message = render_to_string('mails/teammate_request.txt',
                                    context=context)
         send_mail(subject='CIS2 Teammate request', message=message,
-                  from_email=EMAIL_SENDER, recipient_list=[receiver.email],
+                  from_email=DEFAULT_FROM_EMAIL, recipient_list=[receiver.email],
                   html_message=html_message)
 
     def save(self, commit=True):

diff --git a/insitu/views/base.py b/insitu/views/base.py
@@ -4,7 +4,7 @@
 from django_datatables_view.base_datatable_view import BaseDatatableView
 from django.template.loader import render_to_string
 
-from copernicus.settings import EMAIL_SENDER, SITE_URL
+from copernicus.settings import DEFAULT_FROM_EMAIL, SITE_URL
 from insitu.utils import ALL_OPTIONS_LABEL
 from insitu.views.protected.views import ProtectedView
 
@@ -159,7 +159,7 @@ def send_mail(self, target_object, feedback=''):
                                    context=context)
         send_mail(subject=subject,
                   message=message,
-                  from_email=EMAIL_SENDER,
+                  from_email=DEFAULT_FROM_EMAIL,
                   recipient_list=[receiver.email],
                   html_message=html_message
         )