From 54e42b4a2f4b5dc40fe16d7de6d0aedf8663d68c Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Mon, 18 Apr 2016 12:03:35 +0200
Subject: [PATCH] Improve invitation (reloads OK though token can be used only
once)
---
scipost/templates/scipost/FAQ.html | 2 +-
scipost/templates/scipost/register.html | 2 +-
scipost/views.py | 27 ++++++++++++-------------
3 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/scipost/templates/scipost/FAQ.html b/scipost/templates/scipost/FAQ.html
index 50ec75c67..726f72fc3 100644
--- a/scipost/templates/scipost/FAQ.html
+++ b/scipost/templates/scipost/FAQ.html
@@ -115,7 +115,7 @@
<p>More details can be found in our <a href="{% url 'scipost:privacy_policy' %}">Privacy Policy</a>.</p>
<br/>
<div class="flex-greybox">
- <h2>Over SciPost</h2>
+ <h2>About SciPost</h2>
</div>
<h3>Who is behind SciPost?</h3>
<ul>
diff --git a/scipost/templates/scipost/register.html b/scipost/templates/scipost/register.html
index 646810f3f..98a5a1186 100644
--- a/scipost/templates/scipost/register.html
+++ b/scipost/templates/scipost/register.html
@@ -16,7 +16,7 @@
<div class="row">
<div class="col-4">
<h3>Notes:</h3>
- <p><em>Only professional academics (staff members, postdocs, PhD students) can register!</em></p>
+ <p><em style="color: red">Only professional academics (staff members, postdocs, PhD students) can register!</em></p>
<p>Required fields are marked with a *.</p>
<p>An ORCID id is not formally required but helps preventing identification ambiguities.
You can easily get one at <a href="http://orcid.org">orcid.org</a>.</p>
diff --git a/scipost/views.py b/scipost/views.py
index 21d796342..8c13772c9 100644
--- a/scipost/views.py
+++ b/scipost/views.py
@@ -187,7 +187,11 @@ def register(request):
def invitation(request, key):
""" Register, by invitation """
invitation = get_object_or_404(RegistrationInvitation, invitation_key=key)
- if request.method == 'POST':
+ if invitation.responded:
+ errormessage = 'This invitation token has already been used.'
+ elif timezone.now() > invitation.key_expires:
+ errormessage = 'The invitation key has expired.'
+ elif request.method == 'POST':
form = RegistrationForm(request.POST)
Utils.load({'form': form})
if form.is_valid():
@@ -200,6 +204,8 @@ def invitation(request, key):
if Utils.email_already_taken():
return render(request, 'scipost/register.html',
{'form': form, 'invited': True, 'key': key, 'errormessage': 'This email address is already in use'})
+ invitation.responded = True
+ invitation.save()
Utils.create_and_save_contributor(key)
Utils.send_registration_email()
return HttpResponseRedirect(reverse('scipost:thanks_for_registering'))
@@ -207,14 +213,7 @@ def invitation(request, key):
errormessage = 'form is invalidly filled'
return render(request, 'scipost/register.html',
{'form': form, 'invited': True, 'key': key, 'errormessage': errormessage})
- elif timezone.now() > invitation.key_expires:
- invitation_expired = True
- errormessage = 'The invitation key has expired.'
- elif invitation.responded:
- errormessage = 'This invitation token has already been used.'
else:
- invitation.responded = True
- invitation.save()
form = RegistrationForm()
form.fields['title'].initial = invitation.title
form.fields['last_name'].initial = invitation.last_name
@@ -231,12 +230,12 @@ def invitation(request, key):
def activation(request, key):
- activation_expired = False
- already_active = False
+# activation_expired = False
+# already_active = False
contributor = get_object_or_404(Contributor, activation_key=key)
if contributor.user.is_active == False:
if timezone.now() > contributor.key_expires:
- activation_expired = True
+# activation_expired = True
id_user = contributor.user.id
context = {'oldkey': key}
return render(request, 'scipost/request_new_activation_link.html', context)
@@ -245,10 +244,10 @@ def activation(request, key):
contributor.user.save()
return render(request, 'scipost/activation_ack.html')
else:
- already_active = True
+# already_active = True
return render(request, 'scipost/already_activated.html')
- # will never come beyond here
- return render(request, 'scipost/index.html')
+# # will never come beyond here
+# return render(request, 'scipost/index.html')
--
GitLab