From 89615ef6adec65b461515ab8c1f6817a55c71563 Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Sat, 15 May 2021 15:28:10 +0200
Subject: [PATCH] Fix migrations (replace JSON field etc.)
---
aleksis/apps/alsijil/migrations/0001_initial.py | 11 +++++------
aleksis/apps/alsijil/migrations/0002_excuse_type.py | 3 +--
aleksis/apps/alsijil/migrations/0003_extra_mark.py | 3 +--
.../alsijil/migrations/0008_global_permissions.py | 1 -
.../alsijil/migrations/0010_events_extra_lessons.py | 4 ++--
5 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/aleksis/apps/alsijil/migrations/0001_initial.py b/aleksis/apps/alsijil/migrations/0001_initial.py
index 193219608..4a88b98b8 100644
--- a/aleksis/apps/alsijil/migrations/0001_initial.py
+++ b/aleksis/apps/alsijil/migrations/0001_initial.py
@@ -1,6 +1,5 @@
# Generated by Django 3.0.6 on 2020-05-29 10:29
-import django.contrib.postgres.fields.jsonb
import django.contrib.sites.managers
import django.db.models.deletion
from django.db import migrations, models
@@ -33,7 +32,7 @@ class Migration(migrations.Migration):
),
(
"extended_data",
- django.contrib.postgres.fields.jsonb.JSONField(
+ models.JSONField(
default=dict, editable=False
),
),
@@ -92,7 +91,7 @@ class Migration(migrations.Migration):
),
(
"extended_data",
- django.contrib.postgres.fields.jsonb.JSONField(
+ models.JSONField(
default=dict, editable=False
),
),
@@ -140,7 +139,7 @@ class Migration(migrations.Migration):
],
"unique_together": {("lesson_period", "week", "person")},
},
- managers=[("objects", django.contrib.sites.managers.CurrentSiteManager()),],
+ managers=[],
),
migrations.CreateModel(
name="LessonDocumentation",
@@ -156,7 +155,7 @@ class Migration(migrations.Migration):
),
(
"extended_data",
- django.contrib.postgres.fields.jsonb.JSONField(
+ models.JSONField(
default=dict, editable=False
),
),
@@ -202,6 +201,6 @@ class Migration(migrations.Migration):
],
"unique_together": {("lesson_period", "week")},
},
- managers=[("objects", django.contrib.sites.managers.CurrentSiteManager()),],
+ managers=[],
),
]
diff --git a/aleksis/apps/alsijil/migrations/0002_excuse_type.py b/aleksis/apps/alsijil/migrations/0002_excuse_type.py
index 2a752b0f0..395d2e323 100644
--- a/aleksis/apps/alsijil/migrations/0002_excuse_type.py
+++ b/aleksis/apps/alsijil/migrations/0002_excuse_type.py
@@ -1,6 +1,5 @@
# Generated by Django 3.0.8 on 2020-07-10 10:46
-import django.contrib.postgres.fields.jsonb
import django.contrib.sites.managers
import django.db.models.deletion
from django.db import migrations, models
@@ -28,7 +27,7 @@ class Migration(migrations.Migration):
),
(
"extended_data",
- django.contrib.postgres.fields.jsonb.JSONField(
+ models.JSONField(
default=dict, editable=False
),
),
diff --git a/aleksis/apps/alsijil/migrations/0003_extra_mark.py b/aleksis/apps/alsijil/migrations/0003_extra_mark.py
index 177d5cc8f..e0da8d97e 100644
--- a/aleksis/apps/alsijil/migrations/0003_extra_mark.py
+++ b/aleksis/apps/alsijil/migrations/0003_extra_mark.py
@@ -1,6 +1,5 @@
# Generated by Django 3.0.8 on 2020-07-12 12:43
-import django.contrib.postgres.fields.jsonb
import django.contrib.sites.managers
import django.db.models.deletion
from django.db import migrations, models
@@ -28,7 +27,7 @@ class Migration(migrations.Migration):
),
(
"extended_data",
- django.contrib.postgres.fields.jsonb.JSONField(
+ models.JSONField(
default=dict, editable=False
),
),
diff --git a/aleksis/apps/alsijil/migrations/0008_global_permissions.py b/aleksis/apps/alsijil/migrations/0008_global_permissions.py
index 917f6f614..a7d5ba1e3 100644
--- a/aleksis/apps/alsijil/migrations/0008_global_permissions.py
+++ b/aleksis/apps/alsijil/migrations/0008_global_permissions.py
@@ -18,7 +18,6 @@ class Migration(migrations.Migration):
('extended_data', models.JSONField(default=dict, editable=False)),
],
options={
- "default_permissions": (),
'permissions': (('view_week', 'Can view week overview'), ('register_absence', 'Can register absence'), ('list_personal_note_filters', 'Can list all personal note filters')),
'managed': False,
},
diff --git a/aleksis/apps/alsijil/migrations/0010_events_extra_lessons.py b/aleksis/apps/alsijil/migrations/0010_events_extra_lessons.py
index 34611bf38..f0459292f 100644
--- a/aleksis/apps/alsijil/migrations/0010_events_extra_lessons.py
+++ b/aleksis/apps/alsijil/migrations/0010_events_extra_lessons.py
@@ -55,7 +55,7 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='lessondocumentation',
name='year',
- field=models.IntegerField(blank=True, default=aleksis.apps.chronos.util.date.get_current_year, null=True, verbose_name='Year'),
+ field=models.IntegerField(blank=True, null=True, verbose_name='Year'),
),
migrations.AlterField(
model_name='personalnote',
@@ -70,7 +70,7 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='personalnote',
name='year',
- field=models.IntegerField(blank=True, default=aleksis.apps.chronos.util.date.get_current_year, null=True, verbose_name='Year'),
+ field=models.IntegerField(blank=True, null=True, verbose_name='Year'),
),
migrations.AlterUniqueTogether(
name='lessondocumentation',
--
GitLab