From ddfe840d103bbeeea1f0a6d15b46dff49c550315 Mon Sep 17 00:00:00 2001
From: magicfelix <felix@felix-zauberer.de>
Date: Sat, 22 Jul 2023 17:12:57 +0200
Subject: [PATCH] Adapt to Core 4.0 managed_by feature
---
aleksis/apps/kort/migrations/0001_initial.py | 4 +-
.../apps/kort/migrations/0002_card_printer.py | 4 +-
.../migrations/0003_auto_20220308_2023.py | 4 +-
.../migrations/0007_auto_20220315_1957.py | 4 +-
.../migrations/0012_auto_20220529_1435.py | 4 +-
.../kort/migrations/0015_migrate_scopes.py | 2 +-
...gers_alter_cardlayout_managers_and_more.py | 41 +++++++++++++++++++
pyproject.toml | 6 +--
8 files changed, 55 insertions(+), 14 deletions(-)
create mode 100644 aleksis/apps/kort/migrations/0018_alter_card_managers_alter_cardlayout_managers_and_more.py
diff --git a/aleksis/apps/kort/migrations/0001_initial.py b/aleksis/apps/kort/migrations/0001_initial.py
index 00244de..61168be 100644
--- a/aleksis/apps/kort/migrations/0001_initial.py
+++ b/aleksis/apps/kort/migrations/0001_initial.py
@@ -1,6 +1,6 @@
# Generated by Django 3.2.9 on 2021-11-05 15:59
-import django.contrib.sites.managers
+import aleksis.core.managers
from django.db import migrations, models
import django.db.models.deletion
@@ -31,7 +31,7 @@ class Migration(migrations.Migration):
'verbose_name_plural': 'Cards',
},
managers=[
- ('objects', django.contrib.sites.managers.CurrentSiteManager()),
+ ('objects', aleksis.core.managers.AlekSISBaseManager()),
],
),
]
diff --git a/aleksis/apps/kort/migrations/0002_card_printer.py b/aleksis/apps/kort/migrations/0002_card_printer.py
index bb3a6de..903420e 100644
--- a/aleksis/apps/kort/migrations/0002_card_printer.py
+++ b/aleksis/apps/kort/migrations/0002_card_printer.py
@@ -1,6 +1,6 @@
# Generated by Django 3.2.9 on 2021-11-30 20:07
-import django.contrib.sites.managers
+import aleksis.core.managers
from django.db import migrations, models
import django.db.models.deletion
@@ -41,7 +41,7 @@ class Migration(migrations.Migration):
'verbose_name_plural': 'Card printers',
},
managers=[
- ('objects', django.contrib.sites.managers.CurrentSiteManager()),
+ ('objects', aleksis.core.managers.AlekSISBaseManager()),
],
),
migrations.AddField(
diff --git a/aleksis/apps/kort/migrations/0003_auto_20220308_2023.py b/aleksis/apps/kort/migrations/0003_auto_20220308_2023.py
index 7f756af..74c09eb 100644
--- a/aleksis/apps/kort/migrations/0003_auto_20220308_2023.py
+++ b/aleksis/apps/kort/migrations/0003_auto_20220308_2023.py
@@ -1,6 +1,6 @@
# Generated by Django 3.2.12 on 2022-03-08 19:23
-import django.contrib.sites.managers
+import aleksis.core.managers
from django.db import migrations, models
import django.db.models.deletion
@@ -39,7 +39,7 @@ class Migration(migrations.Migration):
'abstract': False,
},
managers=[
- ('objects', django.contrib.sites.managers.CurrentSiteManager()),
+ ('objects', aleksis.core.managers.AlekSISBaseManager()),
],
),
]
diff --git a/aleksis/apps/kort/migrations/0007_auto_20220315_1957.py b/aleksis/apps/kort/migrations/0007_auto_20220315_1957.py
index 5a5cef6..2540173 100644
--- a/aleksis/apps/kort/migrations/0007_auto_20220315_1957.py
+++ b/aleksis/apps/kort/migrations/0007_auto_20220315_1957.py
@@ -1,7 +1,7 @@
# Generated by Django 3.2.12 on 2022-03-15 18:57
from django.conf import settings
-import django.contrib.sites.managers
+import aleksis.core.managers
import django.core.validators
from django.db import migrations, models
import django.db.models.deletion
@@ -43,7 +43,7 @@ class Migration(migrations.Migration):
'verbose_name_plural': 'Card print jobs',
},
managers=[
- ('objects', django.contrib.sites.managers.CurrentSiteManager()),
+ ('objects', aleksis.core.managers.AlekSISBaseManager()),
],
),
]
diff --git a/aleksis/apps/kort/migrations/0012_auto_20220529_1435.py b/aleksis/apps/kort/migrations/0012_auto_20220529_1435.py
index da30961..8c9c377 100644
--- a/aleksis/apps/kort/migrations/0012_auto_20220529_1435.py
+++ b/aleksis/apps/kort/migrations/0012_auto_20220529_1435.py
@@ -1,6 +1,6 @@
# Generated by Django 3.2.13 on 2022-05-29 12:35
-import django.contrib.sites.managers
+import aleksis.core.managers
from django.db import migrations, models
import django.db.models.deletion
@@ -44,7 +44,7 @@ class Migration(migrations.Migration):
'verbose_name_plural': 'Media files for card layouts',
},
managers=[
- ('objects', django.contrib.sites.managers.CurrentSiteManager()),
+ ('objects', aleksis.core.managers.AlekSISBaseManager()),
],
),
]
diff --git a/aleksis/apps/kort/migrations/0015_migrate_scopes.py b/aleksis/apps/kort/migrations/0015_migrate_scopes.py
index 5173713..34068f6 100644
--- a/aleksis/apps/kort/migrations/0015_migrate_scopes.py
+++ b/aleksis/apps/kort/migrations/0015_migrate_scopes.py
@@ -2,7 +2,7 @@ from django.db import migrations
def _migrate_scopes(apps, schema_editor):
CardPrinter = apps.get_model("kort", "CardPrinter")
- for printer in CardPrinter.objects.all():
+ for printer in CardPrinter._base_manager.only("oauth2_application"):
application = printer.oauth2_application
application.allowed_scopes = [f"card_printer_{printer.id}"]
application.authorization_grant_type = "client-credentials"
diff --git a/aleksis/apps/kort/migrations/0018_alter_card_managers_alter_cardlayout_managers_and_more.py b/aleksis/apps/kort/migrations/0018_alter_card_managers_alter_cardlayout_managers_and_more.py
new file mode 100644
index 0000000..c75e313
--- /dev/null
+++ b/aleksis/apps/kort/migrations/0018_alter_card_managers_alter_cardlayout_managers_and_more.py
@@ -0,0 +1,41 @@
+# Generated by Django 4.2.3 on 2023-07-22 14:34
+
+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'),
+ ('kort', '0017_cardprinter_oauth2_client_secret'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='card',
+ 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='cardlayout',
+ 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='cardlayoutmediafile',
+ 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='cardprinter',
+ 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='cardprintjob',
+ 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/pyproject.toml b/pyproject.toml
index c8cfc9a..363537f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
[tool.poetry]
name = "AlekSIS-App-Kort"
-version = "0.2"
+version = "1.0.dev0"
packages = [{ include = "aleksis" }]
readme = "README.rst"
include = ["CHANGELOG.rst", "LICENCE.rst", "aleksis/**/*.mo"]
@@ -35,11 +35,11 @@ priority = "supplemental"
[tool.poetry.dependencies]
python = "^3.9"
-aleksis-core = "^4.0"
+aleksis-core = "^4.0.0.dev0"
python-barcode = "^0.15.0"
django-formtools = "2.2"
django-ace = "^1.0.12"
-pylibsdm = "^1.0.0a0"
+pylibsdm = "^1.0.0a0.dev2"
[tool.poetry.plugins."aleksis.app"]
kort = "aleksis.apps.kort.apps:DefaultConfig"
--
GitLab