Merge pull request open5e#729 from calumbell/693/smoke-test-warnings

[BUGFIX] UnorderedObjectListWarnings on Rule/Ruleset/Image Views

Author: augustjohnson

api_v2/migrations/0042_alter_image_options_alter_rule_options_and_more.py

@@ -0,0 +1,25 @@
+# Generated by Django 5.1.2 on 2025-05-13 10:04
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api_v2', '0041_merge_20250509_0736'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='image',
+            options={'ordering': ['name']},
+        ),
+        migrations.AlterModelOptions(
+            name='rule',
+            options={'ordering': ['name']},
+        ),
+        migrations.AlterModelOptions(
+            name='ruleset',
+            options={'ordering': ['name']},
+        ),
+    ]

api_v2/migrations/0043_alter_image_options_alter_rule_options_and_more.py

@@ -0,0 +1,25 @@
+# Generated by Django 5.1.2 on 2025-05-19 16:10
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api_v2', '0042_alter_image_options_alter_rule_options_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='image',
+            options={'ordering': ['key']},
+        ),
+        migrations.AlterModelOptions(
+            name='rule',
+            options={'ordering': ['key']},
+        ),
+        migrations.AlterModelOptions(
+            name='ruleset',
+            options={'ordering': ['key']},
+        ),
+    ]

api_v2/models/image.py

@@ -37,6 +37,9 @@ def __str__(self):
     @property
     def file_url(self):
         return static(self.file_path)
+    
+    class Meta:
+        ordering = ['key']
 
 
 class HasIcon(models.Model):

api_v2/models/rule.py

@@ -9,6 +9,8 @@ class RuleSet(HasName, HasDescription, FromDocument):
   """
   key = key_field()
 
+  class Meta:
+    ordering = ['key']
 
 class Rule(HasName, HasDescription, FromDocument):
   """"
@@ -34,4 +36,7 @@ class Rule(HasName, HasDescription, FromDocument):
     default=1,
     choices=((i, i) for i in range(1,6)),
     help_text="The header level to set rule title to"
-  )
+  )
+
+  class Meta:
+    ordering = ['key']