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

Prepare release 2.0rc2

See merge request !89

CHANGELOG.rst

@@ -6,6 +6,14 @@ 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.0rc2`_ - 2021-06-26
+----------------------
+
+Fixed
+~~~~~
+
+* Migration for uniqueness per site was broken due to wrong syntax.
+
 `2.0rc1`_ - 2021-06-23
 ----------------------
 
@@ -66,3 +74,4 @@ Added
 .. _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
+.. _2.0rc2: https://edugit.org/AlekSIS/Official/AlekSIS-App-Hjelp/-/tags/2.0rc2

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

@@ -44,7 +44,7 @@ class Migration(migrations.Migration):
         ),
         migrations.AddConstraint(
             model_name='issuecategory',
-            constraint=models.UniqueConstraint(fields=('site_id', 'name'), condition=models.Q(parent='null'), name='unique_category_name_per_site_without_parent'),
+            constraint=models.UniqueConstraint(fields=('site_id', 'name'), condition=models.Q(parent=None), name='unique_category_name_per_site_without_parent'),
         ),
         migrations.AddConstraint(
             model_name='issuecategory',

aleksis/apps/hjelp/models.py

@@ -103,7 +103,7 @@ class IssueCategory(ExtensibleModel):
         constraints = [
             models.UniqueConstraint(
                 fields=["site_id", "name"],
-                condition=models.Q(parent="null"),
+                condition=models.Q(parent=None),
                 name="unique_category_name_per_site_without_parent",
             ),
             models.UniqueConstraint(

pyproject.toml

 [tool.poetry]
 name = "AlekSIS-App-Hjelp"
-version = "2.0rc1"
+version = "2.0rc2"
 packages = [
     { include = "aleksis" }
 ]