Merge branch 'dev' into release/0.23

coderedcms/migrations/0027_auto_20220603_1142.py

@@ -0,0 +1,21 @@
+# Generated by Django 3.2.13 on 2022-06-03 15:42
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('coderedcms', '0026_auto_20220513_1627'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='carouselslide',
+            options={'ordering': ['sort_order'], 'verbose_name': 'Carousel Slide'},
+        ),
+        migrations.AlterModelOptions(
+            name='classifierterm',
+            options={'ordering': ['sort_order'], 'verbose_name': 'Classifier Term', 'verbose_name_plural': 'Classifier Terms'},
+        ),
+    ]

coderedcms/models/page_models.py

@@ -1042,7 +1042,7 @@ class CoderedEventIndexPage(CoderedWebPage):
 
 
 class CoderedEventOccurrence(Orderable, BaseOccurrence):
-    class Meta:
+    class Meta(Orderable.Meta):
         verbose_name = _('CodeRed Event Occurrence')
         abstract = True
 

coderedcms/models/snippet_models.py

@@ -79,7 +79,7 @@ class CarouselSlide(Orderable, models.Model):
     Represents a slide for the Carousel model. Can be modified through the
     snippets UI.
     """
-    class Meta:
+    class Meta(Orderable.Meta):
         verbose_name = _('Carousel Slide')
 
     carousel = ParentalKey(
@@ -172,7 +172,7 @@ class ClassifierTerm(Orderable, models.Model):
     """
     Term used to categorize a page.
     """
-    class Meta:
+    class Meta(Orderable.Meta):
         verbose_name = _('Classifier Term')
         verbose_name_plural = _('Classifier Terms')
 

docs/releases/index.rst

@@ -22,6 +22,7 @@ Wagtail CRX (previously CodeRed CMS) follows the
 .. toctree::
     :maxdepth: 1
 
+    v0.23.1
     v0.23.0
     v0.22.3
     v0.22.2

docs/releases/v0.23.0.rst

@@ -68,6 +68,13 @@ Upgrade considerations
   ``SocialMediaSettings`` model in your local project code, and migrate data to
   it, before upgrading. `This change shows what was removed <https://github.com/coderedcorp/coderedcms/pull/482/files#diff-f2b3f43b8ce0d03ffdd2f133da2f81e186e25c063e374f731727820aa9c14713L20>`_.
 
+* You may need to generate migrations in your app, and apply migrations with:
+
+  .. code-block:: text
+
+     python manage.py makemigrations website
+     python manage.py migrate
+
 
 Supported software
 ------------------

docs/releases/v0.23.1.rst

@@ -0,0 +1,15 @@
+v0.23.1 release notes
+=====================
+
+
+Bug fixes
+---------
+
+* Correctly order classifiers, carousels, and other "orderables" based on the
+  order set in the Wagtail admin.
+
+
+Thank you!
+----------
+
+Thanks to everyone who contributed to `0.23.1 on GitHub <https://github.com/coderedcorp/coderedcms/milestone/38?closed=1>`_.