From 169bf41d8d50aa676012439bc52e182c1ddbb076 Mon Sep 17 00:00:00 2001
From: Boris Ponsioen <boris1592@gmail.com>
Date: Tue, 31 Jan 2017 13:10:30 +0100
Subject: [PATCH] Merge resolved
---
submissions/views.py | 8 --------
1 file changed, 8 deletions(-)
diff --git a/submissions/views.py b/submissions/views.py
index 7c863aff2..3748b74d7 100644
--- a/submissions/views.py
+++ b/submissions/views.py
@@ -480,13 +480,6 @@ def submission_detail_wo_vn_nr(request, arxiv_identifier_wo_vn_nr):
def submission_detail(request, arxiv_identifier_w_vn_nr):
submission = get_object_or_404(Submission, arxiv_identifier_w_vn_nr=arxiv_identifier_w_vn_nr)
-<<<<<<< HEAD
- if (submission.status in SUBMISSION_STATUS_PUBLICLY_UNLISTED and
- request.user.contributor not in submission.authors.all() and not
- request.user.groups.filter(name='SciPost Administrators').exists() and not
- request.user.groups.filter(name='Editorial Administrators').exists() and not
- request.user.groups.filter(name='Editorial College').exists()):
-=======
try:
is_author = request.user.contributor in submission.authors.all()
except AttributeError:
@@ -497,7 +490,6 @@ def submission_detail(request, arxiv_identifier_w_vn_nr):
and not request.user.groups.filter(name='Editorial College').exists()
and not is_author
):
->>>>>>> development
raise PermissionDenied
other_versions = Submission.objects.filter(
arxiv_identifier_wo_vn_nr=submission.arxiv_identifier_wo_vn_nr
--
GitLab