Merge branch 'drop-sites' into 'master'

Drop sites framework

See merge request !43

aleksis/apps/stoelindeling/managers.py

@@ -3,13 +3,13 @@ from typing import TYPE_CHECKING
 
 from django.db.models import Max, Min, QuerySet
 
-from aleksis.core.managers import CurrentSiteManagerWithoutMigrations
+from aleksis.core.managers import AlekSISBaseManagerWithoutMigrations
 
 if TYPE_CHECKING:
     from .models import Seat
 
 
-class SeatManager(CurrentSiteManagerWithoutMigrations):
+class SeatManager(AlekSISBaseManagerWithoutMigrations):
     """Custom manager for Seat model."""
 
 

aleksis/apps/stoelindeling/migrations/0001_initial.py

@@ -12,7 +12,6 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('core', '0035_preference_model_unique'),
-        ('sites', '0002_alter_domain_unique'),
         ('chronos', '0010_remove_subject_unique_name_per_site'),
     ]
 
@@ -28,7 +27,6 @@ class Migration(migrations.Migration):
                 ('extended_data', models.JSONField(default=dict, editable=False)),
                 ('group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.group', verbose_name='Group')),
                 ('room', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='chronos.room', verbose_name='Room')),
-                ('site', models.ForeignKey(default=1, editable=False, on_delete=django.db.models.deletion.CASCADE, to='sites.site')),
                 ('subject', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='chronos.subject', verbose_name='Subject')),
             ],
             options={
@@ -48,7 +46,6 @@ class Migration(migrations.Migration):
                 ('y', models.PositiveIntegerField(verbose_name='Y position')),
                 ('person', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.person', verbose_name='Person')),
                 ('plan', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='stoelindeling.seatingplan', verbose_name='Seating plan')),
-                ('site', models.ForeignKey(default=1, editable=False, on_delete=django.db.models.deletion.CASCADE, to='sites.site')),
             ],
             options={
                 'verbose_name': 'Seat',

aleksis/apps/stoelindeling/migrations/0006_add_managed_by_app_label.py

@@ -8,7 +8,6 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('sites', '0002_alter_domain_unique'),
         ('stoelindeling', '0005_alter_seatingplan_room'),
     ]
 

aleksis/apps/stoelindeling/migrations/0007_drop_sites.py

+# Generated by Django 4.2.9 on 2024-01-11 15:28
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('stoelindeling', '0006_add_managed_by_app_label'),
+    ]
+
+    operations = [
+        migrations.AlterModelManagers(
+            name='seatingplan',
+            managers=[
+            ],
+        ),
+    ] + [
+        migrations.RunSQL(
+            f"ALTER TABLE stoelindeling_{model_name} drop column if exists site_id;"
+        ) for model_name  in
+        [
+            "seatingplan",
+            "seat",
+        ]
+    ]
+

pyproject.toml

 [tool.poetry]
 name = "AlekSIS-App-Stoelindeling"
-version = "3.0.dev0"
+version = "3.0.0.dev0"
 packages = [
     { include = "aleksis" }
 ]
@@ -32,15 +32,15 @@ priority = "primary"
 name = "gitlab"
 url = "https://edugit.org/api/v4/projects/461/packages/pypi/simple"
 priority = "supplemental"
+
 [tool.poetry.dependencies]
 python = "^3.10"
-aleksis-core = "^4.0.0.dev0"
-aleksis-app-chronos = "^4.0.dev0"
+aleksis-core = "^4.0.0.dev2"
+aleksis-app-chronos = "^4.0.0.dev0"
 
 [tool.poetry.plugins."aleksis.app"]
 stoelindeling = "aleksis.apps.stoelindeling.apps:DefaultConfig"
 
-
 [tool.poetry.group.dev.dependencies]
 django-stubs = "^4.2"
 safety = "^2.3.5"