Merge branch 'prepare-release-2.0rc1' into 'release/2.0'

Prepare release 2.0rc1

See merge request !85

CHANGELOG.rst

@@ -6,13 +6,22 @@ All notable changes to this project will be documented in this file.
 The format is based on `Keep a Changelog`_,
 and this project adheres to `Semantic Versioning`_.
 
+`2.0rc1`_ - 2021-06-23
+----------------------
+
+Fixed
+~~~~~
+
+* Include parents in unique key of FAQ sections for site and category.
+
+
 `2.0b1`_ - 2021-06-02
 ---------------------
 
 Changed
 ~~~~~~~~
 
-* Ensure uniqueness per site of FAQ sections and categories.
+* Ensure uniqueness per site of FAQ sections and categories with parents.
 
 
 `2.0b0`_ - 2021-05-21
@@ -56,3 +65,4 @@ Added
 .. _2.0a2: https://edugit.org/AlekSIS/Official/AlekSIS-App-Hjelp/-/tags/2.0a2
 .. _2.0b0: https://edugit.org/AlekSIS/Official/AlekSIS-App-Hjelp/-/tags/2.0b0
 .. _2.0b1: https://edugit.org/AlekSIS/Official/AlekSIS-App-Hjelp/-/tags/2.0b1
+.. _2.0rc1: https://edugit.org/AlekSIS/Official/AlekSIS-App-Hjelp/-/tags/2.0rc1

aleksis/apps/hjelp/locale/de_DE/LC_MESSAGES/django.po

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-05-20 21:06+0200\n"
-"PO-Revision-Date: 2021-05-21 17:32+0000\n"
-"Last-Translator: Lloyd Meins <teckids@lloydmeins.de>\n"
+"PO-Revision-Date: 2021-05-24 20:07+0000\n"
+"Last-Translator: Jonathan Weth <teckids@jonathanweth.de>\n"
 "Language-Team: German <https://translate.edugit.org/projects/aleksis/"
 "aleksis-app-hjelp/de/>\n"
 "Language: de_DE\n"
@@ -112,7 +112,7 @@ msgstr "FAQ"
 #: aleksis/apps/hjelp/templates/hjelp/order_faq.html:4
 #: aleksis/apps/hjelp/templates/hjelp/order_faq.html:5
 msgid "Manage FAQ"
-msgstr "Kann FAQ bearbeiten"
+msgstr "FAQ verwalten"
 
 #: aleksis/apps/hjelp/models.py:14
 msgid "Can view FAQ"

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

@@ -44,6 +44,10 @@ class Migration(migrations.Migration):
         ),
         migrations.AddConstraint(
             model_name='issuecategory',
-            constraint=models.UniqueConstraint(fields=('site_id', 'name'), name='unique_category_name_per_site'),
+            constraint=models.UniqueConstraint(fields=('site_id', 'name'), condition=models.Q(parent='null'), 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'),
         ),
     ]

aleksis/apps/hjelp/models.py

@@ -102,6 +102,12 @@ class IssueCategory(ExtensibleModel):
 
         constraints = [
             models.UniqueConstraint(
-                fields=["site_id", "name"], name="unique_category_name_per_site"
-            )
+                fields=["site_id", "name"],
+                condition=models.Q(parent="null"),
+                name="unique_category_name_per_site_without_parent",
+            ),
+            models.UniqueConstraint(
+                fields=["site_id", "name", "parent"],
+                name="unique_category_name_per_site_with_parent",
+            ),
         ]

pyproject.toml

 [tool.poetry]
 name = "AlekSIS-App-Hjelp"
-version = "2.0b1"
+version = "2.0rc1"
 packages = [
     { include = "aleksis" }
 ]
@@ -31,7 +31,7 @@ secondary = true
 
 [tool.poetry.dependencies]
 python = "^3.9"
-aleksis-core = "^2.0b0"
+aleksis-core = "^2.0rc"
 
 [tool.poetry.dev-dependencies]
 aleksis-builddeps = "*"