From 0c23cd6f7833838098649d120ca8a7a453babd95 Mon Sep 17 00:00:00 2001
From: Geert Kapteijns <ghkapteijns@gmail.com>
Date: Mon, 19 Dec 2016 21:29:12 +0100
Subject: [PATCH] Fix merge conflict in comments migration
---
comments/migrations/0005_merge_20161219_2126.py | 16 ++++++++++++++++
submissions/models.py | 3 ---
theses/views.py | 8 +-------
3 files changed, 17 insertions(+), 10 deletions(-)
create mode 100644 comments/migrations/0005_merge_20161219_2126.py
diff --git a/comments/migrations/0005_merge_20161219_2126.py b/comments/migrations/0005_merge_20161219_2126.py
new file mode 100644
index 000000000..f604a8605
--- /dev/null
+++ b/comments/migrations/0005_merge_20161219_2126.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.3 on 2016-12-19 20:26
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('comments', '0004_auto_20161212_1931'),
+ ('comments', '0004_auto_20161213_1208'),
+ ]
+
+ operations = [
+ ]
diff --git a/submissions/models.py b/submissions/models.py
index 437bd3fb9..3ba5afaa0 100644
--- a/submissions/models.py
+++ b/submissions/models.py
@@ -63,8 +63,6 @@ SUBMISSION_STATUS_PUBLICLY_UNLISTED = [
'withdrawn',
]
-<<<<<<< HEAD
-=======
# Submissions which should not be viewable (except by admins, Fellows and authors)
SUBMISSION_STATUS_PUBLICLY_INVISIBLE = [
'unassigned',
@@ -88,7 +86,6 @@ SUBMISSION_STATUS_PUBLICLY_INVISIBLE = [
# ('Decision_to_authors', 'Editor-in-charge forwards decision to authors'),
# )
->>>>>>> bd85dfe03971d0905f0879386499e8fa0371b6a9
SUBMISSION_TYPE = (
('Letter', 'Letter (broad-interest breakthrough results)'),
('Article', 'Article (in-depth reports on specialized research)'),
diff --git a/theses/views.py b/theses/views.py
index cb9ce0edc..15c6655c6 100644
--- a/theses/views.py
+++ b/theses/views.py
@@ -206,12 +206,7 @@ def thesis_detail(request, thesislink_id):
new_comment.save()
author.nr_comments = Comment.objects.filter(author=author).count()
author.save()
-<<<<<<< HEAD
request.session['thesislink_id'] = thesislink_id
- context = {}
-=======
- #request.session['thesislink_id'] = thesislink_id
- #return HttpResponseRedirect(reverse('comments:comment_submission_ack'))
context = {'ack_header': 'Thank you for contributing a Comment.',
'ack_message': 'It will soon be vetted by an Editor.',
'followup_message': 'Back to the ',
@@ -220,8 +215,7 @@ def thesis_detail(request, thesislink_id):
kwargs={'thesislink_id': newcomment.thesislink.id}
),
'followup_link_label': ' Thesis Link page you came from'
- }
->>>>>>> bd85dfe03971d0905f0879386499e8fa0371b6a9
+ }
return render(request, 'scipost/acknowledgement.html', context)
else:
form = CommentForm()
--
GitLab