From 626990b119b61763168429b8160b157d5fa17a26 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Thu, 15 Aug 2019 11:37:10 +0200 Subject: [PATCH] Use media str method for admin --- media/admin.py | 10 +--------- media/models.py | 6 ++++-- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/media/admin.py b/media/admin.py index 945d891..cdd9f96 100644 --- a/media/admin.py +++ b/media/admin.py @@ -18,7 +18,7 @@ class AuteurAdmin(VersionAdmin): class MediaAdmin(VersionAdmin): - list_display = ('full_name', 'authors_list', 'side_identifier', 'isbn', + list_display = ('__str__', 'authors_list', 'side_identifier', 'isbn', 'external_link') search_fields = ('title', 'authors__nom', 'side_identifier', 'subtitle', 'isbn') @@ -26,14 +26,6 @@ class MediaAdmin(VersionAdmin): date_hierarchy = 'publish_date' form = MediaAdminForm - def full_name(self, obj): - if obj.subtitle: - return "{} : {}".format(obj.title, obj.subtitle) - else: - return obj.title - - full_name.short_description = _('name') - def authors_list(self, obj): return ", ".join([a.nom for a in obj.authors.all()]) diff --git a/media/models.py b/media/models.py index a34de79..e4a070f 100644 --- a/media/models.py +++ b/media/models.py @@ -63,8 +63,10 @@ class Media(models.Model): ) def __str__(self): - return str(self.title) + ' - ' + str(self.subtitle) \ - + ' - ' + str(self.authors.all().first()) + if self.subtitle: + return "{} : {}".format(self.title, self.subtitle) + else: + return self.title class Meta: verbose_name = _("medium")