From 47e985e00132385b57b3d26ed28f30eb626df835 Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Fri, 5 Feb 2016 14:39:00 +0100
Subject: [PATCH] Vet registrations now showing many requests
---
scipost/templates/scipost/FAQ.html | 4 ++--
.../templates/scipost/vet_registration_requests.html | 10 ++++++----
scipost/views.py | 6 ++++--
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/scipost/templates/scipost/FAQ.html b/scipost/templates/scipost/FAQ.html
index 7ebffccbb..35c985e71 100644
--- a/scipost/templates/scipost/FAQ.html
+++ b/scipost/templates/scipost/FAQ.html
@@ -69,11 +69,11 @@
<h2>SciPost Theses</h2>
</div>
<h3>What are Theses?</h3>
- <p>SciPost Theses is a searchable repository of external links to Master's, Ph.D. and Habilitation theses. Besides a validated URL pointing to the original document, Each Thesis Link page contains some relevant summary info (such as Title, Author, degree granting institution, abstract, ...), followed by Comments from Contributors and Author and Contributor Replies. </p>
+ <p>SciPost Theses is a searchable repository of external links to Master's, Ph.D. and Habilitation theses. Besides a validated URL pointing to the original document, each Thesis Link page contains some relevant summary info (such as title, author, degree granting institution, abstract, ...), followed by Comments from Contributors and Author and Contributor Replies. </p>
<br/>
<hr class="hr6">
<h3>How are Thesis Link pages activated?</h3>
- <p>As a registered Contributor, the author of the thesis (or, if unavailable, the supervisor) can request the activation of a Thesis Link by filling is the <a href="{% url 'theses:request_thesislink' %}">Thesis Link request page</a>.</p>
+ <p>As a registered Contributor, the author of the thesis (or, if unavailable, the supervisor or a colleague) can request the activation of a Thesis Link by filling is the <a href="{% url 'theses:request_thesislink' %}">Thesis Link request page</a>.</p>
</div>
<div class="col-1"></div>
<div class="col-5">
diff --git a/scipost/templates/scipost/vet_registration_requests.html b/scipost/templates/scipost/vet_registration_requests.html
index 02de43b14..f9d44dbd4 100644
--- a/scipost/templates/scipost/vet_registration_requests.html
+++ b/scipost/templates/scipost/vet_registration_requests.html
@@ -46,15 +46,16 @@ $( document ).ready(function() {
</script>
<section>
- {% if not contributor_to_vet %}
+ {% if not contributors_to_vet %}
<h1>There are no Registration requests for you to vet.</h1>
{% else %}
- <h1>SciPost Registration request to vet:</h1>
- <p>This Contributor is currently on rank 0 (submitting, commenting and voting disabled).</p>
- <p>Use this form to promote to rank 1.</p>
+ <h1>SciPost Registration requests to vet:</h1>
+ <p>These Contributors are currently on rank 0 (submitting, commenting and voting disabled).</p>
+ <p>Use this page to promote them to rank 1 or refuse registration.</p>
+ {% for contributor_to_vet in contributors_to_vet %}
<br>
<hr>
<div class="row">
@@ -76,6 +77,7 @@ $( document ).ready(function() {
</form>
</div>
</div>
+ {% endfor %}
{% endif %}
</section>
diff --git a/scipost/views.py b/scipost/views.py
index 41949d773..040ce8fc4 100644
--- a/scipost/views.py
+++ b/scipost/views.py
@@ -207,9 +207,11 @@ def already_activated(request):
def vet_registration_requests(request):
contributor = Contributor.objects.get(user=request.user)
- contributor_to_vet = Contributor.objects.filter(user__is_active=True, rank=0).first() # limit to one at a time
+ #contributor_to_vet = Contributor.objects.filter(user__is_active=True, rank=0).first() # limit to one at a time
+ contributors_to_vet = Contributor.objects.filter(user__is_active=True, rank=0).order_by('key_expires')
form = VetRegistrationForm()
- context = {'contributor_to_vet': contributor_to_vet, 'form': form }
+ #context = {'contributor_to_vet': contributor_to_vet, 'form': form }
+ context = {'contributors_to_vet': contributors_to_vet, 'form': form }
return render(request, 'scipost/vet_registration_requests.html', context)
--
GitLab