From cf7dd3b5be0ce03f76f0e6b5284560b434502786 Mon Sep 17 00:00:00 2001
From: George Katsikas <giorgakis.katsikas@gmail.com>
Date: Wed, 17 Apr 2024 10:32:43 +0200
Subject: [PATCH] cleanup migrations from merge

---
 ...aboration_and_more.py => 0152_alter_approaches_name.py} | 7 +------
 ...ations.py => 0153_submission_fulfilled_expectations.py} | 2 +-
 scipost_django/submissions/models/submission.py            | 2 --
 3 files changed, 2 insertions(+), 9 deletions(-)
 rename scipost_django/submissions/migrations/{0151_submission_acceptance_elaboration_and_more.py => 0152_alter_approaches_name.py} (80%)
 rename scipost_django/submissions/migrations/{0152_submission_fulfilled_expectations.py => 0153_submission_fulfilled_expectations.py} (83%)

diff --git a/scipost_django/submissions/migrations/0151_submission_acceptance_elaboration_and_more.py b/scipost_django/submissions/migrations/0152_alter_approaches_name.py
similarity index 80%
rename from scipost_django/submissions/migrations/0151_submission_acceptance_elaboration_and_more.py
rename to scipost_django/submissions/migrations/0152_alter_approaches_name.py
index 47bbe8bee..f11068290 100644
--- a/scipost_django/submissions/migrations/0151_submission_acceptance_elaboration_and_more.py
+++ b/scipost_django/submissions/migrations/0152_alter_approaches_name.py
@@ -6,15 +6,10 @@ import scipost.fields
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("submissions", "0150_submission_code_metadata"),
+        ("submissions", "0151_report_publicly_visible"),
     ]
 
     operations = [
-        migrations.AddField(
-            model_name="submission",
-            name="acceptance_elaboration",
-            field=models.TextField(blank=True, default=""),
-        ),
         migrations.AlterField(
             model_name="submission",
             name="approaches",
diff --git a/scipost_django/submissions/migrations/0152_submission_fulfilled_expectations.py b/scipost_django/submissions/migrations/0153_submission_fulfilled_expectations.py
similarity index 83%
rename from scipost_django/submissions/migrations/0152_submission_fulfilled_expectations.py
rename to scipost_django/submissions/migrations/0153_submission_fulfilled_expectations.py
index 654a242e0..eccb291d2 100644
--- a/scipost_django/submissions/migrations/0152_submission_fulfilled_expectations.py
+++ b/scipost_django/submissions/migrations/0153_submission_fulfilled_expectations.py
@@ -5,7 +5,7 @@ from django.db import migrations, models
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("submissions", "0151_submission_acceptance_elaboration_and_more"),
+        ("submissions", "0152_alter_approaches_name"),
     ]
 
     operations = [
diff --git a/scipost_django/submissions/models/submission.py b/scipost_django/submissions/models/submission.py
index 56cfd782e..332e5bf3d 100644
--- a/scipost_django/submissions/models/submission.py
+++ b/scipost_django/submissions/models/submission.py
@@ -410,8 +410,6 @@ class Submission(models.Model):
     latest_activity = models.DateTimeField(auto_now=True)
     update_search_index = models.BooleanField(default=True)
 
-    acceptance_elaboration = models.TextField(blank=True, default="")
-
     objects = SubmissionQuerySet.as_manager()
 
     # Temporary
-- 
GitLab