summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPrabhu Ramachandran2017-05-11 19:10:21 +0530
committerGitHub2017-05-11 19:10:21 +0530
commitd6373c8ddb43e41224dc1cbd75bc894515401b11 (patch)
tree85db0791969c5509038ef8181c28a4e24793fcc0
parentb6993d79ae2f0d18375555f5ada72b52a3a2e066 (diff)
parent30adb68a68345dca24da8c4984e2065d6481e463 (diff)
downloadonline_test-d6373c8ddb43e41224dc1cbd75bc894515401b11.tar.gz
online_test-d6373c8ddb43e41224dc1cbd75bc894515401b11.tar.bz2
online_test-d6373c8ddb43e41224dc1cbd75bc894515401b11.zip
Merge pull request #293 from maheshgudi/email_fix
Email editable content
-rw-r--r--online_test/settings.py4
-rw-r--r--yaksh/send_emails.py8
2 files changed, 8 insertions, 4 deletions
diff --git a/online_test/settings.py b/online_test/settings.py
index 26449d4..4ca2967 100644
--- a/online_test/settings.py
+++ b/online_test/settings.py
@@ -113,7 +113,6 @@ EMAIL_HOST_USER = 'email_host_user'
EMAIL_HOST_PASSWORD = 'email_host_password'
-
# Set EMAIL_BACKEND to 'django.core.mail.backends.smtp.EmailBackend' in production
EMAIL_BACKEND = 'django.core.mail.backends.dummy.EmailBackend'
@@ -124,6 +123,9 @@ EMAIL_BACKEND = 'django.core.mail.backends.dummy.EmailBackend'
# For example no_reply@<your_organization>.in can be used.
SENDER_EMAIL = 'your_email'
+# Organisation/Indivudual Name.
+SENDER_NAME = 'your_name'
+
# This email id will be used by users to send their queries
# For example queries@<your_organization>.in can be used.
REPLY_EMAIL = 'your_reply_email'
diff --git a/yaksh/send_emails.py b/yaksh/send_emails.py
index 37736d5..8983024 100644
--- a/yaksh/send_emails.py
+++ b/yaksh/send_emails.py
@@ -38,9 +38,11 @@ def send_user_mail(user_mail, key):
copy and paste the URL in a new browser window instead.
For any issue, please write us on {2}
- Regards
- Yaksh Team
- """.format(settings.PRODUCTION_URL, key, settings.REPLY_EMAIL)
+ Regards,
+ {3}
+ """.format(settings.PRODUCTION_URL, key, settings.REPLY_EMAIL,
+ settings.SENDER_NAME
+ )
)
send_mail(subject, message, settings.SENDER_EMAIL, [to])