From 5b303b23a9945c22c4224fe32adcb7ada2c5545a Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Tue, 10 Apr 2018 12:26:25 +0200
Subject: [PATCH] Fixing nothing much
---
.../submissions/arxiv_queryresult.html | 2 +-
.../recommendation_prepare_for_voting.html | 4 +--
submissions/views.py | 28 +++++++++----------
3 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/submissions/templates/partials/submissions/arxiv_queryresult.html b/submissions/templates/partials/submissions/arxiv_queryresult.html
index 5f2ad667f..d490dd040 100644
--- a/submissions/templates/partials/submissions/arxiv_queryresult.html
+++ b/submissions/templates/partials/submissions/arxiv_queryresult.html
@@ -4,7 +4,7 @@
{% for author in item.authors %}
{{ author.name }}{% if not forloop.last %},{% endif %}
{% endfor %}
- - <a href="{{ item.id }}" target="_blank">{{ item.id }}</a>
+ - <a href="{{ item.link }}" target="_blank">{{ item.id }}</a>
</div>
<p class="card-text text-muted">Published: {{ item.published }}</p>
</div>
diff --git a/submissions/templates/submissions/admin/recommendation_prepare_for_voting.html b/submissions/templates/submissions/admin/recommendation_prepare_for_voting.html
index 67c157592..1bf68269b 100644
--- a/submissions/templates/submissions/admin/recommendation_prepare_for_voting.html
+++ b/submissions/templates/submissions/admin/recommendation_prepare_for_voting.html
@@ -56,10 +56,10 @@
</div>
<div class="card-body">
<ul class="list-group list-group-flush">
- {% for key, value in coauthorships.items %}
+ {% for author, value in coauthorships.items %}
<li class="list-group-item pt-3">
<div class="card-content">
- <h3>For Fellow {{key}}:</h3>
+ <h3>For Fellow: {{ author }}</h3>
</div>
</li>
{% for entry in value.entries %}
diff --git a/submissions/views.py b/submissions/views.py
index b1c816f5c..f7f7fbdc0 100644
--- a/submissions/views.py
+++ b/submissions/views.py
@@ -1392,7 +1392,7 @@ def prepare_for_voting(request, rec_id):
fellows_with_expertise = recommendation.submission.fellows.filter(
contributor__expertises__contains=[recommendation.submission.subject_area])
- coauthorships = []
+ coauthorships = {}
eligibility_form = VotingEligibilityForm(request.POST or None, instance=recommendation)
if eligibility_form.is_valid():
eligibility_form.save()
@@ -1406,27 +1406,25 @@ def prepare_for_voting(request, rec_id):
args=[recommendation.submission.arxiv_identifier_w_vn_nr]))
else:
# Identify possible co-authorships in last 3 years, disqualifying Fellow from voting:
- if recommendation.submission.metadata is not None:
+ if recommendation.submission.metadata and 'entries' in recommendation.submission.metadata:
author_last_names = []
for author in recommendation.submission.metadata['entries'][0]['authors']:
# Gather author data to do conflict-of-interest queries with
author_last_names.append(author['name'].split()[-1])
+ authors_last_names_str = '+OR+'.join(author_last_names)
- fellow_last_names = []
for fellow in fellows_with_expertise:
# For each fellow found, so a query with the authors to check for conflicts
- fellow_last_names.append(fellow.contributor.user.last_name)
-
- search_query = 'au:(({fellows})+AND+({authors}))'.format(
- fellows='+OR+'.join(fellow_last_names),
- authors='+OR+'.join(author_last_names))
- queryurl = 'https://export.arxiv.org/api/query?search_query={sq}'.format(
- sq=search_query)
- queryurl += '&sortBy=submittedDate&sortOrder=descending&max_results=5'
- queryurl = queryurl.replace(' ', '+') # Fallback for some last names with spaces
- queryresults = feedparser.parse(queryurl)
- if queryresults.entries:
- coauthorships = queryresults
+ search_query = 'au:({fellow}+AND+({authors}))'.format(
+ fellow=fellow.contributor.user.last_name,
+ authors=authors_last_names_str)
+ queryurl = 'https://export.arxiv.org/api/query?search_query={sq}'.format(
+ sq=search_query)
+ queryurl += '&sortBy=submittedDate&sortOrder=descending&max_results=5'
+ queryurl = queryurl.replace(' ', '+') # Fallback for some last names with spaces
+ queryresults = feedparser.parse(queryurl)
+ if queryresults.entries:
+ coauthorships[fellow.contributor.user.last_name] = queryresults
context = {
'recommendation': recommendation,
--
GitLab