oly
/
hackspace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Email should now send on stage

This commit is contained in:
Oliver Marks 2017-02-05 17:04:08 +00:00
parent 46502c164a
commit b55e16009d
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
config/settings/stage.py
View File

@ -108,17 +108,17 @@ COMPRESS_ENABLED = env.bool('COMPRESS_ENABLED', default=True)
# EMAIL # EMAIL
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
DEFAULT_FROM_EMAIL = env('DJANGO_DEFAULT_FROM_EMAIL', DEFAULT_FROM_EMAIL = env('DJANGO_DEFAULT_FROM_EMAIL',
default='Maidstone Hackspace <noreply@test.maidstone-hackspace.org.uk>') default='Maidstone Hackspace <no-reply@test.maidstone-hackspace.org.uk>')
EMAIL_SUBJECT_PREFIX = env('DJANGO_EMAIL_SUBJECT_PREFIX', default='[Maidstone Hackspace] ') EMAIL_SUBJECT_PREFIX = env('DJANGO_EMAIL_SUBJECT_PREFIX', default='[Maidstone Hackspace] ')
SERVER_EMAIL = env('DJANGO_SERVER_EMAIL', default=DEFAULT_FROM_EMAIL) SERVER_EMAIL = env('DJANGO_SERVER_EMAIL', default=DEFAULT_FROM_EMAIL)
SERVER_EMAIL_PORT = '465' SERVER_EMAIL_PORT = '587'
EMAIL_USE_TLS = False EMAIL_USE_TLS = True
EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
EMAIL_HOST = 'smtp.gmail.com' EMAIL_HOST = 'smtp.gmail.com'
EMAIL_HOST_PASSWORD = env('EMAIL_PASSWORD') EMAIL_HOST_PASSWORD = env('EMAIL_PASSWORD')
EMAIL_HOST_USER = env('EMAIL_USER') EMAIL_HOST_USER = env('EMAIL_USER')
EMAIL_PORT = 465 EMAIL_PORT = 587
# Anymail with Mailgun # Anymail with Mailgun
#INSTALLED_APPS += ("anymail", ) #INSTALLED_APPS += ("anymail", )
@ -193,12 +193,12 @@ LOGGING = {
'console': { 'console': {
'level': 'DEBUG', 'level': 'DEBUG',
'class': 'logging.StreamHandler', 'class': 'logging.StreamHandler',
'formatter': 'verbose', 'formatter': 'verbose',00
}, },
'logfile': { 'logfile': {
'level':'DEBUG', 'level':'DEBUG',
'class':'logging.FileHandler', 'class':'logging.FileHandler',
'filename': BASE_DIR + "/../logfile", 'filename': ROOT_DIR.path("django.log"),
}, },
}, },
'loggers': { 'loggers': {

5
mhackspace/contact/views.py
View File

@ -6,7 +6,6 @@ from mhackspace.contact.forms import ContactForm
# add to your views # add to your views
def contact(request): def contact(request):
form_class = ContactForm form_class = ContactForm
form = form_class(data=request.POST)
if request.method == 'POST': if request.method == 'POST':
form = form_class(data=request.POST) form = form_class(data=request.POST)
if form.is_valid(): if form.is_valid():
@ -14,9 +13,11 @@ def contact(request):
email = EmailMessage( email = EmailMessage(
'[%s] - %s' % (data['enquiry_type'], data['subject']), '[%s] - %s' % (data['enquiry_type'], data['subject']),
data['message'], data['message'],
to=['no-reply@maidstone-hackspace..org.uk']) to=['contact@maidstone-hackspace.org.uk'])
email.send() email.send()
messages.add_message(request, messages.INFO, 'E-Mail sent') messages.add_message(request, messages.INFO, 'E-Mail sent')
else:
form = form_class()
return render(request, 'pages/contact.html', { return render(request, 'pages/contact.html', {