From d8379fe198c1040721712a19c1a07ff12b05049b Mon Sep 17 00:00:00 2001 From: Josh Washburne Date: Fri, 12 Jan 2018 16:34:43 -0500 Subject: [PATCH] Default ordering models and "full_title" for Song. --- savepointradio/radio/models.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/savepointradio/radio/models.py b/savepointradio/radio/models.py index 77d27fc..147e628 100644 --- a/savepointradio/radio/models.py +++ b/savepointradio/radio/models.py @@ -17,6 +17,9 @@ class Album(Disableable, Publishable, Timestampable, models.Model): editable=False, max_length=255) + class Meta: + ordering = ['sorted_title', ] + def __str__(self): return self.title @@ -34,6 +37,9 @@ class Artist(Disableable, Publishable, Timestampable, models.Model): editable=False, max_length=255) + class Meta: + ordering = ['sorted_full_name', ] + @property def full_name(self): if not self.alias: @@ -61,6 +67,9 @@ class Game(Disableable, Publishable, Timestampable, models.Model): editable=False, max_length=255) + class Meta: + ordering = ['sorted_title', ] + def __str__(self): return self.title @@ -110,7 +119,11 @@ class Song(Disableable, Publishable, Timestampable, models.Model): objects = models.Manager() music = SongManager() - def __str__(self): + class Meta: + ordering = ['sorted_title', ] + + @property + def full_title(self): if self.song_type == 'J': return self.title else: @@ -118,3 +131,6 @@ class Song(Disableable, Publishable, Timestampable, models.Model): return '{} - {} ({})'.format(self.game.title, self.title, all_artists) + + def __str__(self): + return self.title