From 90985d0d3ae4239d33c1a159bd91aa0f9c3d4c21 Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Sat, 22 Apr 2017 09:30:44 +0200
Subject: [PATCH] Fix double routes

---
 SciPost_v1/urls.py | 1 -
 scipost/urls.py    | 2 +-
 scipost/views.py   | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/SciPost_v1/urls.py b/SciPost_v1/urls.py
index 45b0ccceb..c9de03f6f 100644
--- a/SciPost_v1/urls.py
+++ b/SciPost_v1/urls.py
@@ -31,7 +31,6 @@ urlpatterns = [
     url(r'^10.21468/%s/' % JOURNAL_REGEX, include('journals.urls.journal', namespace="journal")),
     url(r'^%s/' % JOURNAL_REGEX, include('journals.urls.journal', namespace="journal")),
     url(r'^', include('scipost.urls', namespace="scipost")),
-    url(r'^contributor/', include('scipost.urls', namespace="scipost")),
     url(r'^commentaries/', include('commentaries.urls', namespace="commentaries")),
     url(r'^commentary/', include('commentaries.urls', namespace="commentaries")),
     url(r'^comments/', include('comments.urls', namespace="comments")),
diff --git a/scipost/urls.py b/scipost/urls.py
index ebbd67e5f..d12d2fc75 100644
--- a/scipost/urls.py
+++ b/scipost/urls.py
@@ -136,7 +136,7 @@ urlpatterns = [
         name='mark_unavailable_period'),
 
     # Contributor info
-    url(r'^(?P<contributor_id>[0-9]+)$', views.contributor_info, name="contributor_info"),
+    url(r'^contributor/(?P<contributor_id>[0-9]+)$', views.contributor_info, name="contributor_info"),
 
     # Authorship claims
     url(r'^claim_authorships$', views.claim_authorships, name="claim_authorships"),
diff --git a/scipost/views.py b/scipost/views.py
index d3ad00c66..3ebfee4ad 100644
--- a/scipost/views.py
+++ b/scipost/views.py
@@ -1075,7 +1075,7 @@ def contributor_info(request, contributor_id):
     Contributor's activities/contributions by clicking
     on the relevant name (in listing headers of Submissions, ...).
     """
-    contributor = Contributor.objects.get(pk=contributor_id)
+    contributor = get_object_or_404(Contributor, pk=contributor_id)
     contributor_publications = Publication.objects.published().filter(authors=contributor)
     contributor_submissions = Submission.objects.public().filter(authors=contributor)
     contributor_commentaries = Commentary.objects.filter(authors=contributor)
-- 
GitLab