summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--workshop_app/send_mails.py87
-rw-r--r--workshop_app/templates/workshop_app/password_change_done.html10
-rw-r--r--workshop_app/templates/workshop_app/password_reset_done.html10
-rw-r--r--workshop_app/templates/workshop_app/password_reset_form.html6
-rw-r--r--workshop_app/templates/workshop_app/registration/register.html (renamed from workshop_app/templates/workshop_app/register.html)0
-rw-r--r--workshop_app/views.py18
-rw-r--r--workshop_portal/settings.py3
7 files changed, 56 insertions, 78 deletions
diff --git a/workshop_app/send_mails.py b/workshop_app/send_mails.py
index 3f2e7c2..15fc1d5 100644
--- a/workshop_app/send_mails.py
+++ b/workshop_app/send_mails.py
@@ -18,7 +18,8 @@ from workshop_portal.settings import (
EMAIL_HOST_PASSWORD,
EMAIL_USE_TLS,
PRODUCTION_URL,
- SENDER_EMAIL
+ SENDER_EMAIL,
+ ADMIN_EMAIL
)
from django.core.mail import EmailMultiAlternatives
from django.conf import settings
@@ -88,76 +89,30 @@ def send_email( request, call_on,
'''
if call_on == "Registration":
- if user_position == "instructor":
- message = dedent("""\
- Your request as an Instructor at FOSSEE, IIT Bombay
- has been received. Please click on the below link to
+ message = dedent("""\
+ Thank you for registering as a coordinator with us.
+
+ Please click on the below link to
activate your account
{0}/activate_user/{1}
+
+ After activation you can proceed to book your dates for
+ the workshop(s).
- You will be notified via email on
- approval of your instructor account
- within 3 working days.
-
- In case of queries regarding the same revert to this
- email.""".format(PRODUCTION_URL, key))
-
- try:
- send_mail(
- "Instructor Registration - FOSSEE, IIT Bombay", message,
- SENDER_EMAIL, [request.user.email], fail_silently=False
- )
- except Exception:
- send_smtp_email(request=request,
- subject="Instructor Registration - FOSSEE, IIT Bombay",
- message=message, other_email=request.user.email,
- )
-
-
- #Send a mail to admin as well.
- message = dedent("""\
- A new instructor request has been received.
-
- Instructor name: {0}
- Instructor email: {1}
-
- Please verify the profile and mail the user within 2
- working days.""".format(request.user, request.user.email))
-
- try:
- send_mail("New Instructor Registration - FOSSEE, IIT Bombay",
- message, SENDER_EMAIL, ['workshops@fossee.in'],
- fail_silently=False)
- except Exception:
- send_smtp_email(request=request,
- subject="Instructor Registration - FOSSEE, IIT Bombay",
- message=message, other_email='workshops@fossee.in',
- )
-
- else:
- message = dedent("""\
- Thank you for registering as a coordinator with us.
-
- Please click on the below link to
- activate your account
- {0}/activate_user/{1}
-
- After activation you can proceed to book your dates for
- the workshop(s).
+ In case of queries regarding workshop booking(s),
+ revert to this email.""".format(PRODUCTION_URL, key))
- In case of queries regarding workshop booking(s),
- revert to this email.""".format(PRODUCTION_URL, key))
+ try:
+ send_mail(
+ "Coordinator Registration at FOSSEE, IIT Bombay", message, SENDER_EMAIL,
+ [request.user.email], fail_silently=False
+ )
- try:
- send_mail(
- "Coordinator Registration at FOSSEE, IIT Bombay", message, SENDER_EMAIL,
- [request.user.email, 'workshops@fossee.in'], fail_silently=False
- )
- except Exception:
- send_smtp_email(request=request,
- subject="Coordinator Registration - FOSSEE, IIT Bombay",
- message=message, other_email=request.user.email,
- )
+ except Exception:
+ send_smtp_email(request=request,
+ subject="Coordinator Registration - FOSSEE, IIT Bombay",
+ message=message, other_email=request.user.email,
+ )
elif call_on == "Booking":
if user_position == "instructor":
diff --git a/workshop_app/templates/workshop_app/password_change_done.html b/workshop_app/templates/workshop_app/password_change_done.html
index 45c8162..fc87389 100644
--- a/workshop_app/templates/workshop_app/password_change_done.html
+++ b/workshop_app/templates/workshop_app/password_change_done.html
@@ -1,6 +1,9 @@
{% extends "base.html" %}
-{% block pagetitle %}Password change successful{% endblock %}
+{% block pagetitle %}
+ Password change successful
+{% endblock %}
+
{% block script %}
<script type="text/javascript">
window.setTimeout(function()
@@ -9,7 +12,8 @@
}, 2000);
</script>
{% endblock %}
+
{% block content %}
-<h3>Your password has been changed successfully.</h3>
-<h4>Redirecting ...</h4>
+ <h3>Your password has been changed successfully.</h3>
+ <h4>Redirecting ...</h4>
{% endblock %}
diff --git a/workshop_app/templates/workshop_app/password_reset_done.html b/workshop_app/templates/workshop_app/password_reset_done.html
index 1ac7b60..7b4f09a 100644
--- a/workshop_app/templates/workshop_app/password_reset_done.html
+++ b/workshop_app/templates/workshop_app/password_reset_done.html
@@ -1,3 +1,9 @@
{% extends "base.html" %}
-{% block title %}Password reset successful{% endblock %}
-{% block pagetitle %} Instruction for setting new password has been mailed to your registered email address {% endblock %}
+
+{% block title %}
+ Password reset successful
+{% endblock %}
+
+{% block pagetitle %}
+ Instruction for setting new password has been mailed to your registered email address
+{% endblock %}
diff --git a/workshop_app/templates/workshop_app/password_reset_form.html b/workshop_app/templates/workshop_app/password_reset_form.html
index fa14e9e..8a7c09d 100644
--- a/workshop_app/templates/workshop_app/password_reset_form.html
+++ b/workshop_app/templates/workshop_app/password_reset_form.html
@@ -1,5 +1,9 @@
{% extends "base.html" %}
-{% block pagetitle %} Email will be send to the registered email address {% endblock %}
+
+{% block pagetitle %}
+ Email will be send to the registered email address
+{% endblock %}
+
{% block content %}
<form action="" method="post">
{% csrf_token %}
diff --git a/workshop_app/templates/workshop_app/register.html b/workshop_app/templates/workshop_app/registration/register.html
index 6804ad0..6804ad0 100644
--- a/workshop_app/templates/workshop_app/register.html
+++ b/workshop_app/templates/workshop_app/registration/register.html
diff --git a/workshop_app/views.py b/workshop_app/views.py
index 59500d6..3446995 100644
--- a/workshop_app/views.py
+++ b/workshop_app/views.py
@@ -137,7 +137,7 @@ def activate_user(request, key=None):
def user_register(request):
- '''User Registeration form'''
+ '''User Registration form'''
if request.method == 'POST':
form = UserRegistrationForm(request.POST)
if form.is_valid():
@@ -157,7 +157,7 @@ def user_register(request):
if request.user.is_authenticated():
return redirect('/view_profile/')
return render(
- request, "workshop_app/register.html",
+ request, "workshop_app/registration/register.html",
{"form": form}
)
else:
@@ -166,7 +166,7 @@ def user_register(request):
elif request.user.is_authenticated():
return render(request, 'workshop_app/activation.html')
form = UserRegistrationForm()
- return render(request, "workshop_app/register.html", {"form": form})
+ return render(request, "workshop_app/registration/register.html", {"form": form})
#This is shown to coordinator for booking workshops
@@ -673,9 +673,15 @@ def propose_workshop(request):
if form.is_valid():
form_data = form.save(commit=False)
form_data.proposed_workshop_coordinator = user
- form_data.proposed_workshop_coordinator.save()
- form_data.save()
- return redirect('/my_workshops/')
+ #Avoiding Duplicate workshop entries for same date and workshop_title
+ if ProposeWorkshopDate.objects.filter(proposed_workshop_date=form_data.proposed_workshop_date,
+ proposed_workshop_title=form_data.proposed_workshop_title,
+ proposed_workshop_coordinator=form_data.proposed_workshop_coordinator).exists():
+ return redirect('/my_workshops/')
+ else:
+ form_data.proposed_workshop_coordinator.save()
+ form_data.save()
+ return redirect('/my_workshops/')
else:
form = ProposeWorkshopDateForm()
return render(
diff --git a/workshop_portal/settings.py b/workshop_portal/settings.py
index c0a90df..5379985 100644
--- a/workshop_portal/settings.py
+++ b/workshop_portal/settings.py
@@ -151,10 +151,13 @@ EMAIL_USE_TLS = EMAIL_USE_TLS
EMAIL_TIMEOUT = 300
SENDER_EMAIL = SENDER_EMAIL
+
#EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' #Temp Solution
#Change this to the production url
PRODUCTION_URL = 'your_production_url'
+ADMIN_EMAIL = 'your admin email'
+
LOGIN_REDIRECT_URL = '/profile'
SESSION_EXPIRE_AT_BROWSER_CLOSE = True
generated by cgit (git 2.34.1) at 2025-02-21 01:52:36 +0000