From 0457ce4c4881afc15b31c08763f231e5b4fd004c Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Thu, 6 Dec 2018 14:11:35 +0100
Subject: [PATCH] Fix migrations and admin
---
submissions/admin.py | 2 ++
submissions/migrations/0046_auto_20181130_1013.py | 3 ++-
submissions/migrations/0049_auto_20181204_2040.py | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/submissions/admin.py b/submissions/admin.py
index 78df5387c..d41460b4e 100644
--- a/submissions/admin.py
+++ b/submissions/admin.py
@@ -31,6 +31,8 @@ class SubmissionAdminForm(forms.ModelForm):
authors_false_claims = forms.ModelMultipleChoiceField(
required=False,
queryset=Contributor.objects.order_by('user__last_name'))
+ is_resubmission_of = forms.ModelChoiceField(
+ queryset=Submission.objects.order_by('-preprint__identifier_w_vn_nr'))
class Meta:
model = Submission
diff --git a/submissions/migrations/0046_auto_20181130_1013.py b/submissions/migrations/0046_auto_20181130_1013.py
index 41769a5db..f86576602 100644
--- a/submissions/migrations/0046_auto_20181130_1013.py
+++ b/submissions/migrations/0046_auto_20181130_1013.py
@@ -10,7 +10,8 @@ def populate_explicit_resubmission_links(apps, schema_editor):
for resubmission in Submission.objects.filter(preprint__vn_nr__gt=1):
resub_of = Submission.objects.filter(
- preprint__identifier_wo_vn_nr=resubmission.preprint.identifier_wo_vn_nr).order_by(
+ preprint__identifier_wo_vn_nr=resubmission.preprint.identifier_wo_vn_nr,
+ preprint__vn_nr__lt=resubmission.preprint.vn_nr).order_by(
'-preprint__vn_nr').exclude(id=resubmission.id).first()
Submission.objects.filter(id=resubmission.id).update(is_resubmission_of=resub_of)
diff --git a/submissions/migrations/0049_auto_20181204_2040.py b/submissions/migrations/0049_auto_20181204_2040.py
index bbcd903d8..de5091d21 100644
--- a/submissions/migrations/0049_auto_20181204_2040.py
+++ b/submissions/migrations/0049_auto_20181204_2040.py
@@ -21,7 +21,7 @@ def populate_thread_hashes(apps, schema_editor):
for original_submission in Submission.objects.filter(is_resubmission_of__isnull=True):
children_ids = get_thread_ids(original_submission, [original_submission.id])
- Submission.objects.filter(id__in=children_ids).update(thread_hash=uuid.uuid4())
+ Submission.objects.filter(id__in=children_ids).update(thread_hash=original_submission.thread_hash)
class Migration(migrations.Migration):
--
GitLab