Merge branch 'drop-sites' into 'master'

Drop sites framework

See merge request !142

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

@@ -12,9 +12,7 @@ class Migration(migrations.Migration):
 
     initial = True
 
-    dependencies = [
-        ("sites", "0002_alter_domain_unique"),
-    ]
+    dependencies = []
 
     operations = [
         migrations.CreateModel(
@@ -1063,15 +1061,6 @@ class Migration(migrations.Migration):
                         verbose_name="Parent category",
                     ),
                 ),
-                (
-                    "site",
-                    models.ForeignKey(
-                        default=1,
-                        editable=False,
-                        on_delete=django.db.models.deletion.CASCADE,
-                        to="sites.Site",
-                    ),
-                ),
             ],
             options={
                 "verbose_name": "Issue category",
@@ -2071,15 +2060,6 @@ class Migration(migrations.Migration):
                         verbose_name="Icon",
                     ),
                 ),
-                (
-                    "site",
-                    models.ForeignKey(
-                        default=1,
-                        editable=False,
-                        on_delete=django.db.models.deletion.CASCADE,
-                        to="sites.Site",
-                    ),
-                ),
             ],
             options={
                 "verbose_name": "FAQ section",
@@ -3091,15 +3071,6 @@ class Migration(migrations.Migration):
                         verbose_name="FAQ Section",
                     ),
                 ),
-                (
-                    "site",
-                    models.ForeignKey(
-                        default=1,
-                        editable=False,
-                        on_delete=django.db.models.deletion.CASCADE,
-                        to="sites.Site",
-                    ),
-                ),
             ],
             options={
                 "verbose_name": "FAQ question",

aleksis/apps/hjelp/migrations/0004_unique_constraints.py

@@ -40,14 +40,14 @@ class Migration(migrations.Migration):
         ),
         migrations.AddConstraint(
             model_name='faqsection',
-            constraint=models.UniqueConstraint(fields=('site_id', 'name'), name='unique_section_name_per_site'),
+            constraint=models.UniqueConstraint(fields=('name',), name='unique_section_name_per_site'),
         ),
         migrations.AddConstraint(
             model_name='issuecategory',
-            constraint=models.UniqueConstraint(fields=('site_id', 'name'), condition=models.Q(parent=None), name='unique_category_name_per_site_without_parent'),
+            constraint=models.UniqueConstraint(fields=('name',), condition=models.Q(parent=None), name='unique_category_name_per_site_without_parent'),
         ),
         migrations.AddConstraint(
             model_name='issuecategory',
-            constraint=models.UniqueConstraint(fields=('site_id', 'name', 'parent'), name='unique_category_name_per_site_with_parent'),
+            constraint=models.UniqueConstraint(fields=('name', 'parent',), name='unique_category_name_per_site_with_parent'),
         ),
     ]

aleksis/apps/hjelp/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'),
         ('hjelp', '0005_update_icon_choices'),
     ]
 

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

+# Generated by Django 4.2.10 on 2024-02-12 11:30
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('hjelp', '0006_add_managed_by_app_label'),
+    ]
+
+    operations = [
+        migrations.AlterModelManagers(
+            name='faqquestion',
+            managers=[
+            ],
+        ),
+        migrations.AlterModelManagers(
+            name='faqsection',
+            managers=[
+            ],
+        ),
+        migrations.AlterModelManagers(
+            name='issuecategory',
+            managers=[
+            ],
+        ),
+        migrations.AlterField(
+            model_name='faqquestion',
+            name='icon',
+            field=models.CharField(blank=True, choices=[], default='question_answer', max_length=50, verbose_name='Icon'),
+        ),
+        migrations.AlterField(
+            model_name='faqsection',
+            name='icon',
+            field=models.CharField(blank=True, choices=[], default='question_answer', max_length=50, verbose_name='Icon'),
+        ),
+        migrations.AlterField(
+            model_name='issuecategory',
+            name='icon',
+            field=models.CharField(blank=True, choices=[], default='bug_report', max_length=50, verbose_name='Icon'),
+        ),
+         migrations.RemoveConstraint(
+            model_name='faqsection',
+            name='unique_section_name_per_site',
+        ),
+        migrations.RemoveConstraint(
+            model_name='issuecategory',
+            name='unique_category_name_per_site_without_parent',
+        ),
+        migrations.RemoveConstraint(
+            model_name='issuecategory',
+            name='unique_category_name_per_site_with_parent',
+        ),
+    ] + [
+        migrations.RunSQL(
+            f"ALTER TABLE hjelp_{model_name} drop column if exists site_id;"
+        ) for model_name  in
+        [
+            "faqquestion",
+            "faqsection",
+            "issuecategory",
+        ]
+    ] + [
+        migrations.AlterField(
+            model_name='faqsection',
+            name='name',
+            field=models.CharField(max_length=255, unique=True, verbose_name='Name'),
+        ),
+        migrations.AddConstraint(
+            model_name='issuecategory',
+            constraint=models.UniqueConstraint(condition=models.Q(('parent', None)), fields=('name',), name='unique_category_name_without_parent'),
+        ),
+        migrations.AddConstraint(
+            model_name='issuecategory',
+            constraint=models.UniqueConstraint(fields=('name', 'parent'), name='unique_category_name_with_parent'),
+        ),
+    ]
+

aleksis/apps/hjelp/models.py

@@ -23,7 +23,7 @@ class HjelpGlobalPermissions(GlobalPermissionModel):  # noqa: DJ10,DJ11,DJ08
 class FAQSection(ExtensibleModel):
     data_checks = [field_validation_data_check_factory("hjelp", "FAQSection", "icon")]
 
-    name = models.CharField(max_length=255, verbose_name=_("Name"))
+    name = models.CharField(max_length=255, verbose_name=_("Name"), unique=True)
 
     icon = models.CharField(
         max_length=50,
@@ -42,10 +42,6 @@ class FAQSection(ExtensibleModel):
         verbose_name_plural = _("FAQ sections")
         ordering = ["position"]
 
-        constraints = [
-            models.UniqueConstraint(fields=["site_id", "name"], name="unique_section_name_per_site")
-        ]
-
     def __str__(self):
         return self.name
 
@@ -120,13 +116,13 @@ class IssueCategory(ExtensibleModel):
 
         constraints = [
             models.UniqueConstraint(
-                fields=["site_id", "name"],
+                fields=["name"],
                 condition=models.Q(parent=None),
-                name="unique_category_name_per_site_without_parent",
+                name="unique_category_name_without_parent",
             ),
             models.UniqueConstraint(
-                fields=["site_id", "name", "parent"],
-                name="unique_category_name_per_site_with_parent",
+                fields=["name", "parent"],
+                name="unique_category_name_with_parent",
             ),
         ]
 

pyproject.toml

 [tool.poetry]
 name = "AlekSIS-App-Hjelp"
-version = "4.0.dev0"
+version = "4.0.0.dev0"
 packages = [
     { include = "aleksis" }
 ]
@@ -39,9 +39,10 @@ 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-core = "^4.0.0.dev3"
 
 [tool.poetry.plugins."aleksis.app"]
 hjelp = "aleksis.apps.hjelp.apps:HjelpConfig"
@@ -88,6 +89,7 @@ section-order = ["future", "standard-library", "django", "third-party", "first-p
 
 [tool.ruff.isort.sections]
 django = ["django"]
+
 [build-system]
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"