From 240d77e99c8f91a4b171bd8cfdcc2dd807b416a1 Mon Sep 17 00:00:00 2001
From: Boris Ponsioen <boris1592@gmail.com>
Date: Tue, 31 Jan 2017 13:11:21 +0100
Subject: [PATCH] Merge resolved
---
submissions/views.py | 4 ----
1 file changed, 4 deletions(-)
diff --git a/submissions/views.py b/submissions/views.py
index 3748b74d7..9895f12dd 100644
--- a/submissions/views.py
+++ b/submissions/views.py
@@ -1443,17 +1443,13 @@ def fix_College_decision(request, rec_id):
recommendation.submission.status = 'accepted'
elif recommendation.recommendation == -3:
# Reject
-<<<<<<< HEAD
recommendation.submission.status = 'rejected'
-=======
- recommendation.submission.status='rejected'
previous_submissions = Submission.objects.filter(
arxiv_identifier_wo_vn_nr=recommendation.submission.arxiv_identifier_wo_vn_nr
).exclude(pk=recommendation.submission.id)
for sub in previous_submissions:
sub.status = 'resubmitted_rejected'
sub.save()
->>>>>>> development
recommendation.submission.save()
SubmissionUtils.load({'submission': recommendation.submission,
--
GitLab