From b2f900d15dcc728f766fde2f2c2528db6ff33a53 Mon Sep 17 00:00:00 2001 From: Anatoly Date: Fri, 4 Oct 2019 13:25:42 +0300 Subject: [PATCH] gm-148: refactored --- apps/gallery/admin.py | 7 ++++++- apps/gallery/models.py | 2 +- apps/main/models.py | 1 - apps/utils/models.py | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/apps/gallery/admin.py b/apps/gallery/admin.py index fc20b0ee..f5aa0194 100644 --- a/apps/gallery/admin.py +++ b/apps/gallery/admin.py @@ -5,4 +5,9 @@ from gallery.models import Image @admin.register(Image) class ImageModelAdmin(admin.ModelAdmin): - """Image model admin""" + """Image model admin.""" + list_display = ['id', 'title', 'image_tag', 'orientation_display'] + + def orientation_display(self, obj): + """Get image orientation name.""" + return obj.get_orientation_display() if obj.orientation else None diff --git a/apps/gallery/models.py b/apps/gallery/models.py index 1388f910..bf3870cb 100644 --- a/apps/gallery/models.py +++ b/apps/gallery/models.py @@ -37,7 +37,7 @@ class Image(ProjectBaseMixin, SORLImageMixin, PlatformMixin): def __str__(self): """String representation""" - return str(self.id) + return f'{self.title}' def delete_image(self, completely: bool = True): """ diff --git a/apps/main/models.py b/apps/main/models.py index fa6cf7d1..df04fd8a 100644 --- a/apps/main/models.py +++ b/apps/main/models.py @@ -353,7 +353,6 @@ class Carousel(models.Model): return self.content_object.establishment_type.name_translated - class Page(models.Model): """Page model.""" diff --git a/apps/utils/models.py b/apps/utils/models.py index 5ff52e22..fbfd186d 100644 --- a/apps/utils/models.py +++ b/apps/utils/models.py @@ -210,7 +210,7 @@ class SORLImageMixin(models.Model): def image_tag(self): """Admin preview tag.""" if self.image: - return mark_safe('' % self.image.url) + return mark_safe(f'') else: return None