diff options
| -rw-r--r-- | Scipy2019/urls.py | 18 | ||||
| -rw-r--r-- | website/send_mails.py | 8 |
2 files changed, 12 insertions, 14 deletions
diff --git a/Scipy2019/urls.py b/Scipy2019/urls.py index dd1fb39..af31979 100644 --- a/Scipy2019/urls.py +++ b/Scipy2019/urls.py @@ -1,4 +1,4 @@ -"""Scipy2019 URL Configuration +"""Scipy URL Configuration The `urlpatterns` list routes URLs to views. For more information please see: https://docs.djangoproject.com/en/2.1/topics/http/urls/ @@ -19,23 +19,23 @@ from django.contrib.auth import views as auth_views urlpatterns = [ - re_path(r'^2019/', include('website.urls', namespace='website')), - re_path(r'^2019/accounts/', + re_path(r'^', include('website.urls', namespace='website')), + re_path(r'^accounts/', include(('django.contrib.auth.urls', 'auth'), namespace='auth')), path('admin/', admin.site.urls), re_path(r'^', include('social.apps.django_app.urls', namespace='social')), - re_path(r'^2019/forgotpassword/$', auth_views.PasswordResetView.as_view( + re_path(r'^forgotpassword/$', auth_views.PasswordResetView.as_view( template_name='registration/password_reset_form.html'), name="password_reset"), - re_path(r'^2019/password_reset/(?P<uidb64>[0-9A-Za-z]+)-(?P<token>.+)/$', auth_views.PasswordResetConfirmView.as_view( + re_path(r'^password_reset/(?P<uidb64>[0-9A-Za-z]+)-(?P<token>.+)/$', auth_views.PasswordResetConfirmView.as_view( template_name='registration/password_reset_confirm.html'), name='password_reset_confirm'), - re_path(r'^2019/password_reset/mail_sent/$', auth_views.PasswordResetDoneView.as_view(template_name='registration/password_reset_done.html'), + re_path(r'^password_reset/mail_sent/$', auth_views.PasswordResetDoneView.as_view(template_name='registration/password_reset_done.html'), name='password_reset_done'), - re_path(r'^2019/password_reset/complete/$', auth_views.PasswordResetCompleteView.as_view(template_name='registration/password_reset_complete.html'), + re_path(r'^password_reset/complete/$', auth_views.PasswordResetCompleteView.as_view(template_name='registration/password_reset_complete.html'), name='password_reset_complete'), - re_path(r'^2019/changepassword/$', auth_views.PasswordChangeView.as_view(template_name='registration/password_change_form.html'), + re_path(r'^changepassword/$', auth_views.PasswordChangeView.as_view(template_name='registration/password_change_form.html'), name='password_change'), - re_path(r'^2019/password_change/done/$', auth_views.PasswordChangeDoneView.as_view(template_name='registration/password_change_done.html'), + re_path(r'^password_change/done/$', auth_views.PasswordChangeDoneView.as_view(template_name='registration/password_change_done.html'), name='password_change_done'), ] diff --git a/website/send_mails.py b/website/send_mails.py index eb4e25b..ca631db 100644 --- a/website/send_mails.py +++ b/website/send_mails.py @@ -1,5 +1,3 @@ -__author__ = "Akshen Doke" - import hashlib import logging import logging.config @@ -111,20 +109,20 @@ def send_email(request, call_on, print(LOG_FOLDER) if call_on == "Registration": message = dedent("""\ - Thank you for registering for SciPy India 2018. + Thank you for registering for SciPy India 2019. You can now proceed to submit a paper/workshop for the conference. In case of queries regarding submitting a proposal, revert to this email.""".format(settings.PRODUCTION_URL, key)) try: send_mail( - "User Registration - SciPy India 2018, FOSSEE, IIT Bombay", message, SENDER_EMAIL, + "User Registration - SciPy India 2019, FOSSEE, IIT Bombay", message, SENDER_EMAIL, [request.user.email], fail_silently=True ) except Exception: send_smtp_email(request=request, - subject="User Registration - SciPy India 2018, FOSSEE, IIT Bombay", + subject="User Registration - SciPy India 2019, FOSSEE, IIT Bombay", message=message, other_email=request.user.email, ) |