From a98fe0243e0df36a5f4eb3baa7c488ea19ee5a38 Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Thu, 20 Jul 2023 22:48:07 +0200
Subject: [PATCH] Fix migration history
---
aleksis/core/managers.py | 8 +-
...happlication_post_logout_redirect_uris.py} | 2 +-
.../migrations/0050_managed_by_app_label.py | 184 +++++++++++++
.../0051_calendarevent_and_holiday.py | 2 -
..._and_more.py => 0052_site_related_name.py} | 254 +-----------------
...calendar_event_add_managed_by_app_label.py | 22 --
aleksis/core/schema/__init__.py | 2 +-
7 files changed, 196 insertions(+), 278 deletions(-)
rename aleksis/core/migrations/{0055_oauthapplication_post_logout_redirect_uris.py => 0049_oauthapplication_post_logout_redirect_uris.py} (91%)
create mode 100644 aleksis/core/migrations/0050_managed_by_app_label.py
rename aleksis/core/migrations/{0056_alter_activity_managers_and_more.py => 0052_site_related_name.py} (99%)
delete mode 100644 aleksis/core/migrations/0057_calendar_event_add_managed_by_app_label.py
diff --git a/aleksis/core/managers.py b/aleksis/core/managers.py
index 07237fdac..1c9266ab7 100644
--- a/aleksis/core/managers.py
+++ b/aleksis/core/managers.py
@@ -33,6 +33,12 @@ class CurrentSiteManagerWithoutMigrations(AlekSISBaseManager):
use_in_migrations = False
+class AlekSISBaseManagerWithoutMigrations(AlekSISBaseManager):
+ """AlekSISBaseManager for auto-generating managers just by query sets."""
+
+ use_in_migrations = False
+
+
class DateRangeQuerySetMixin:
"""QuerySet with custom query methods for models with date ranges.
@@ -139,7 +145,7 @@ class InstalledWidgetsDashboardWidgetOrderManager(Manager):
return super().get_queryset().filter(widget_id__in=dashboard_widget_pks)
-class PolymorphicCurrentSiteManager(AlekSISBaseManager, PolymorphicManager):
+class PolymorphicCurrentSiteManager(AlekSISBaseManagerWithoutMigrations, PolymorphicManager):
"""Default manager for extensible, polymorphic models."""
diff --git a/aleksis/core/migrations/0055_oauthapplication_post_logout_redirect_uris.py b/aleksis/core/migrations/0049_oauthapplication_post_logout_redirect_uris.py
similarity index 91%
rename from aleksis/core/migrations/0055_oauthapplication_post_logout_redirect_uris.py
rename to aleksis/core/migrations/0049_oauthapplication_post_logout_redirect_uris.py
index 0d1232de9..a14526b2f 100644
--- a/aleksis/core/migrations/0055_oauthapplication_post_logout_redirect_uris.py
+++ b/aleksis/core/migrations/0049_oauthapplication_post_logout_redirect_uris.py
@@ -7,7 +7,7 @@ import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
("sites", "0002_alter_domain_unique"),
- ("core", "0054_calendarevent_timezone"),
+ ("core", "0048_delete_personalicalurl"),
]
operations = [
diff --git a/aleksis/core/migrations/0050_managed_by_app_label.py b/aleksis/core/migrations/0050_managed_by_app_label.py
new file mode 100644
index 000000000..0de24ef5f
--- /dev/null
+++ b/aleksis/core/migrations/0050_managed_by_app_label.py
@@ -0,0 +1,184 @@
+# Generated by Django 4.1.9 on 2023-07-06 21:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("sites", "0002_alter_domain_unique"),
+ ("core", "0049_oauthapplication_post_logout_redirect_uris"),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name="activity",
+ name="managed_by_app_label",
+ field=models.CharField(
+ blank=True,
+ editable=False,
+ max_length=255,
+ verbose_name="App label of app responsible for managing this instance",
+ ),
+ ),
+ migrations.AddField(
+ model_name="additionalfield",
+ name="managed_by_app_label",
+ field=models.CharField(
+ blank=True,
+ editable=False,
+ max_length=255,
+ verbose_name="App label of app responsible for managing this instance",
+ ),
+ ),
+ migrations.AddField(
+ model_name="announcement",
+ name="managed_by_app_label",
+ field=models.CharField(
+ blank=True,
+ editable=False,
+ max_length=255,
+ verbose_name="App label of app responsible for managing this instance",
+ ),
+ ),
+ migrations.AddField(
+ model_name="announcementrecipient",
+ name="managed_by_app_label",
+ field=models.CharField(
+ blank=True,
+ editable=False,
+ max_length=255,
+ verbose_name="App label of app responsible for managing this instance",
+ ),
+ ),
+ migrations.AddField(
+ model_name="custommenu",
+ name="managed_by_app_label",
+ field=models.CharField(
+ blank=True,
+ editable=False,
+ max_length=255,
+ verbose_name="App label of app responsible for managing this instance",
+ ),
+ ),
+ migrations.AddField(
+ model_name="custommenuitem",
+ name="managed_by_app_label",
+ field=models.CharField(
+ blank=True,
+ editable=False,
+ max_length=255,
+ verbose_name="App label of app responsible for managing this instance",
+ ),
+ ),
+ migrations.AddField(
+ model_name="dashboardwidgetorder",
+ name="managed_by_app_label",
+ field=models.CharField(
+ blank=True,
+ editable=False,
+ max_length=255,
+ verbose_name="App label of app responsible for managing this instance",
+ ),
+ ),
+ migrations.AddField(
+ model_name="datacheckresult",
+ name="managed_by_app_label",
+ field=models.CharField(
+ blank=True,
+ editable=False,
+ max_length=255,
+ verbose_name="App label of app responsible for managing this instance",
+ ),
+ ),
+ migrations.AddField(
+ model_name="group",
+ name="managed_by_app_label",
+ field=models.CharField(
+ blank=True,
+ editable=False,
+ max_length=255,
+ verbose_name="App label of app responsible for managing this instance",
+ ),
+ ),
+ migrations.AddField(
+ model_name="grouptype",
+ name="managed_by_app_label",
+ field=models.CharField(
+ blank=True,
+ editable=False,
+ max_length=255,
+ verbose_name="App label of app responsible for managing this instance",
+ ),
+ ),
+ migrations.AddField(
+ model_name="notification",
+ name="managed_by_app_label",
+ field=models.CharField(
+ blank=True,
+ editable=False,
+ max_length=255,
+ verbose_name="App label of app responsible for managing this instance",
+ ),
+ ),
+ migrations.AddField(
+ model_name="pdffile",
+ name="managed_by_app_label",
+ field=models.CharField(
+ blank=True,
+ editable=False,
+ max_length=255,
+ verbose_name="App label of app responsible for managing this instance",
+ ),
+ ),
+ migrations.AddField(
+ model_name="person",
+ name="managed_by_app_label",
+ field=models.CharField(
+ blank=True,
+ editable=False,
+ max_length=255,
+ verbose_name="App label of app responsible for managing this instance",
+ ),
+ ),
+ migrations.AddField(
+ model_name="persongroupthrough",
+ name="managed_by_app_label",
+ field=models.CharField(
+ blank=True,
+ editable=False,
+ max_length=255,
+ verbose_name="App label of app responsible for managing this instance",
+ ),
+ ),
+ migrations.AddField(
+ model_name="room",
+ name="managed_by_app_label",
+ field=models.CharField(
+ blank=True,
+ editable=False,
+ max_length=255,
+ verbose_name="App label of app responsible for managing this instance",
+ ),
+ ),
+ migrations.AddField(
+ model_name="schoolterm",
+ name="managed_by_app_label",
+ field=models.CharField(
+ blank=True,
+ editable=False,
+ max_length=255,
+ verbose_name="App label of app responsible for managing this instance",
+ ),
+ ),
+ migrations.AddField(
+ model_name="taskuserassignment",
+ name="managed_by_app_label",
+ field=models.CharField(
+ blank=True,
+ editable=False,
+ max_length=255,
+ verbose_name="App label of app responsible for managing this instance",
+ ),
+ ),
+ ]
diff --git a/aleksis/core/migrations/0051_calendarevent_and_holiday.py b/aleksis/core/migrations/0051_calendarevent_and_holiday.py
index 28e529402..76d64c0e6 100644
--- a/aleksis/core/migrations/0051_calendarevent_and_holiday.py
+++ b/aleksis/core/migrations/0051_calendarevent_and_holiday.py
@@ -97,7 +97,6 @@ class Migration(migrations.Migration):
},
bases=(aleksis.core.mixins.CalendarEventMixin, models.Model),
managers=[
- ("objects", aleksis.core.managers.PolymorphicCurrentSiteManager()),
],
),
migrations.CreateModel(
@@ -122,7 +121,6 @@ class Migration(migrations.Migration):
},
bases=("core.calendarevent",),
managers=[
- ("objects", aleksis.core.managers.PolymorphicCurrentSiteManager()),
],
),
migrations.AddConstraint(
diff --git a/aleksis/core/migrations/0056_alter_activity_managers_and_more.py b/aleksis/core/migrations/0052_site_related_name.py
similarity index 99%
rename from aleksis/core/migrations/0056_alter_activity_managers_and_more.py
rename to aleksis/core/migrations/0052_site_related_name.py
index 3edabd1c6..9d6791850 100644
--- a/aleksis/core/migrations/0056_alter_activity_managers_and_more.py
+++ b/aleksis/core/migrations/0052_site_related_name.py
@@ -1,265 +1,17 @@
-# Generated by Django 4.1.9 on 2023-06-30 11:36
+# Generated by Django 4.1.10 on 2023-07-20 20:35
-import aleksis.core.managers
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
+
dependencies = [
("sites", "0002_alter_domain_unique"),
- ("core", "0055_oauthapplication_post_logout_redirect_uris"),
+ ("core", "0051_calendarevent_and_holiday"),
]
operations = [
- migrations.AlterModelManagers(
- name="activity",
- managers=[
- ("objects", aleksis.core.managers.AlekSISBaseManager()),
- ],
- ),
- migrations.AlterModelManagers(
- name="additionalfield",
- managers=[
- ("objects", aleksis.core.managers.AlekSISBaseManager()),
- ],
- ),
- migrations.AlterModelManagers(
- name="announcementrecipient",
- managers=[
- ("objects", aleksis.core.managers.AlekSISBaseManager()),
- ],
- ),
- migrations.AlterModelManagers(
- name="custommenu",
- managers=[
- ("objects", aleksis.core.managers.AlekSISBaseManager()),
- ],
- ),
- migrations.AlterModelManagers(
- name="custommenuitem",
- managers=[
- ("objects", aleksis.core.managers.AlekSISBaseManager()),
- ],
- ),
- migrations.AlterModelManagers(
- name="datacheckresult",
- managers=[
- ("objects", aleksis.core.managers.AlekSISBaseManager()),
- ],
- ),
- migrations.AlterModelManagers(
- name="grouptype",
- managers=[
- ("objects", aleksis.core.managers.AlekSISBaseManager()),
- ],
- ),
- migrations.AlterModelManagers(
- name="notification",
- managers=[
- ("objects", aleksis.core.managers.AlekSISBaseManager()),
- ],
- ),
- migrations.AlterModelManagers(
- name="pdffile",
- managers=[
- ("objects", aleksis.core.managers.AlekSISBaseManager()),
- ],
- ),
- migrations.AlterModelManagers(
- name="person",
- managers=[
- ("objects", aleksis.core.managers.AlekSISBaseManager()),
- ],
- ),
- migrations.AlterModelManagers(
- name="persongroupthrough",
- managers=[
- ("objects", aleksis.core.managers.AlekSISBaseManager()),
- ],
- ),
- migrations.AlterModelManagers(
- name="room",
- managers=[
- ("objects", aleksis.core.managers.AlekSISBaseManager()),
- ],
- ),
- migrations.AlterModelManagers(
- name="taskuserassignment",
- managers=[
- ("objects", aleksis.core.managers.AlekSISBaseManager()),
- ],
- ),
- migrations.AddField(
- model_name="activity",
- name="managed_by_app_label",
- field=models.CharField(
- blank=True,
- editable=False,
- max_length=255,
- verbose_name="App label of app responsible for managing this instance",
- ),
- ),
- migrations.AddField(
- model_name="additionalfield",
- name="managed_by_app_label",
- field=models.CharField(
- blank=True,
- editable=False,
- max_length=255,
- verbose_name="App label of app responsible for managing this instance",
- ),
- ),
- migrations.AddField(
- model_name="announcement",
- name="managed_by_app_label",
- field=models.CharField(
- blank=True,
- editable=False,
- max_length=255,
- verbose_name="App label of app responsible for managing this instance",
- ),
- ),
- migrations.AddField(
- model_name="announcementrecipient",
- name="managed_by_app_label",
- field=models.CharField(
- blank=True,
- editable=False,
- max_length=255,
- verbose_name="App label of app responsible for managing this instance",
- ),
- ),
- migrations.AddField(
- model_name="custommenu",
- name="managed_by_app_label",
- field=models.CharField(
- blank=True,
- editable=False,
- max_length=255,
- verbose_name="App label of app responsible for managing this instance",
- ),
- ),
- migrations.AddField(
- model_name="custommenuitem",
- name="managed_by_app_label",
- field=models.CharField(
- blank=True,
- editable=False,
- max_length=255,
- verbose_name="App label of app responsible for managing this instance",
- ),
- ),
- migrations.AddField(
- model_name="dashboardwidgetorder",
- name="managed_by_app_label",
- field=models.CharField(
- blank=True,
- editable=False,
- max_length=255,
- verbose_name="App label of app responsible for managing this instance",
- ),
- ),
- migrations.AddField(
- model_name="datacheckresult",
- name="managed_by_app_label",
- field=models.CharField(
- blank=True,
- editable=False,
- max_length=255,
- verbose_name="App label of app responsible for managing this instance",
- ),
- ),
- migrations.AddField(
- model_name="group",
- name="managed_by_app_label",
- field=models.CharField(
- blank=True,
- editable=False,
- max_length=255,
- verbose_name="App label of app responsible for managing this instance",
- ),
- ),
- migrations.AddField(
- model_name="grouptype",
- name="managed_by_app_label",
- field=models.CharField(
- blank=True,
- editable=False,
- max_length=255,
- verbose_name="App label of app responsible for managing this instance",
- ),
- ),
- migrations.AddField(
- model_name="notification",
- name="managed_by_app_label",
- field=models.CharField(
- blank=True,
- editable=False,
- max_length=255,
- verbose_name="App label of app responsible for managing this instance",
- ),
- ),
- migrations.AddField(
- model_name="pdffile",
- name="managed_by_app_label",
- field=models.CharField(
- blank=True,
- editable=False,
- max_length=255,
- verbose_name="App label of app responsible for managing this instance",
- ),
- ),
- migrations.AddField(
- model_name="person",
- name="managed_by_app_label",
- field=models.CharField(
- blank=True,
- editable=False,
- max_length=255,
- verbose_name="App label of app responsible for managing this instance",
- ),
- ),
- migrations.AddField(
- model_name="persongroupthrough",
- name="managed_by_app_label",
- field=models.CharField(
- blank=True,
- editable=False,
- max_length=255,
- verbose_name="App label of app responsible for managing this instance",
- ),
- ),
- migrations.AddField(
- model_name="room",
- name="managed_by_app_label",
- field=models.CharField(
- blank=True,
- editable=False,
- max_length=255,
- verbose_name="App label of app responsible for managing this instance",
- ),
- ),
- migrations.AddField(
- model_name="schoolterm",
- name="managed_by_app_label",
- field=models.CharField(
- blank=True,
- editable=False,
- max_length=255,
- verbose_name="App label of app responsible for managing this instance",
- ),
- ),
- migrations.AddField(
- model_name="taskuserassignment",
- name="managed_by_app_label",
- field=models.CharField(
- blank=True,
- editable=False,
- max_length=255,
- verbose_name="App label of app responsible for managing this instance",
- ),
- ),
migrations.AlterField(
model_name="activity",
name="site",
diff --git a/aleksis/core/migrations/0057_calendar_event_add_managed_by_app_label.py b/aleksis/core/migrations/0057_calendar_event_add_managed_by_app_label.py
deleted file mode 100644
index 4b40bcd95..000000000
--- a/aleksis/core/migrations/0057_calendar_event_add_managed_by_app_label.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Generated by Django 4.1.9 on 2023-07-05 13:04
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
- dependencies = [
- ("core", "0056_alter_activity_managers_and_more"),
- ]
-
- operations = [
- migrations.AddField(
- model_name="calendarevent",
- name="managed_by_app_label",
- field=models.CharField(
- blank=True,
- editable=False,
- max_length=255,
- verbose_name="App label of app responsible for managing this instance",
- ),
- ),
- ]
diff --git a/aleksis/core/schema/__init__.py b/aleksis/core/schema/__init__.py
index 3279e7b12..a1c2896ef 100644
--- a/aleksis/core/schema/__init__.py
+++ b/aleksis/core/schema/__init__.py
@@ -142,7 +142,7 @@ class Query(graphene.ObjectType):
return get_objects_for_user(info.context.user, "core.view_group", Group)
@staticmethod
- def resolve_group_by_id(root, info, id): # noqa
+ def resolve_group_by_id(root, info, id): # noqa
group = Group.objects.filter(id=id)
if len(group) != 1:
--
GitLab