diff --git a/ram/metadata/migrations/0014_alter_decoder_options_alter_tag_options.py b/ram/metadata/migrations/0014_alter_decoder_options_alter_tag_options.py new file mode 100644 index 0000000..f593439 --- /dev/null +++ b/ram/metadata/migrations/0014_alter_decoder_options_alter_tag_options.py @@ -0,0 +1,20 @@ +# Generated by Django 4.2.6 on 2023-10-10 12:44 + +from django.db import migrations + + +class Migration(migrations.Migration): + dependencies = [ + ("metadata", "0013_decoderdocument_private"), + ] + + operations = [ + migrations.AlterModelOptions( + name="decoder", + options={"ordering": ["manufacturer", "name"]}, + ), + migrations.AlterModelOptions( + name="tag", + options={"ordering": ["name"]}, + ), + ] diff --git a/ram/metadata/models.py b/ram/metadata/models.py index acccf61..5112c31 100644 --- a/ram/metadata/models.py +++ b/ram/metadata/models.py @@ -95,6 +95,9 @@ class Decoder(models.Model): upload_to="images/", storage=DeduplicatedStorage, null=True, blank=True ) + class Meta(object): + ordering = ["manufacturer", "name"] + def __str__(self): return "{0} - {1}".format(self.manufacturer, self.name) @@ -163,6 +166,9 @@ class Tag(models.Model): name = models.CharField(max_length=128, unique=True) slug = models.CharField(max_length=128, unique=True) + class Meta(object): + ordering = ["name"] + def __str__(self): return self.name diff --git a/ram/portal/templates/cards/book.html b/ram/portal/templates/cards/book.html index b2f77f8..d34fd0c 100644 --- a/ram/portal/templates/cards/book.html +++ b/ram/portal/templates/cards/book.html @@ -1,11 +1,7 @@
diff --git a/ram/portal/templates/cards/consist.html b/ram/portal/templates/cards/consist.html index c0f4b67..b8cfc31 100644 --- a/ram/portal/templates/cards/consist.html +++ b/ram/portal/templates/cards/consist.html @@ -2,12 +2,10 @@