From 6accb660063a43dd236d35cd17a787adfa97c8d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= Date: Sun, 21 Aug 2022 16:53:18 +0200 Subject: [PATCH 1/3] Enable search by sku --- ram/portal/views.py | 1 + ram/ram/__init__.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ram/portal/views.py b/ram/portal/views.py index 7c890ac..b613b9d 100644 --- a/ram/portal/views.py +++ b/ram/portal/views.py @@ -61,6 +61,7 @@ class GetHomeFiltered(View): | Q(rolling_class__description__icontains=s) | Q(rolling_class__type__type__icontains=s) | Q(road_number__icontains=s) + | Q(sku=s) | Q(rolling_class__company__name__icontains=s) | Q(rolling_class__company__country__icontains=s) | Q(manufacturer__name__icontains=s) diff --git a/ram/ram/__init__.py b/ram/ram/__init__.py index 16357c1..39cbfb2 100644 --- a/ram/ram/__init__.py +++ b/ram/ram/__init__.py @@ -1,4 +1,4 @@ from ram.utils import git_suffix -__version__ = "0.0.12" +__version__ = "0.0.13" __version__ += git_suffix(__file__) From f580bcffc56b99a1ce2e95b5be58a4f3cd122ee8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= Date: Mon, 22 Aug 2022 17:12:22 +0200 Subject: [PATCH 2/3] Documents section in admin --- ram/roster/admin.py | 16 ++++++++++++++++ ram/roster/models.py | 8 +++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/ram/roster/admin.py b/ram/roster/admin.py index 970e593..2dde810 100644 --- a/ram/roster/admin.py +++ b/ram/roster/admin.py @@ -46,6 +46,22 @@ class RollingStockPropertyInline(admin.TabularInline): extra = 0 +@admin.register(RollingStockDocument) +class RollingStockDocumentAdmin(admin.ModelAdmin): + list_display = ( + "__str__", + "rolling_stock", + "description", + "download", + ) + search_fields = ( + "rolling_stock__rolling_class__identifier", + "rolling_stock__sku", + "description", + "file", + ) + + @admin.register(RollingStock) class RollingStockAdmin(admin.ModelAdmin): inlines = ( diff --git a/ram/roster/models.py b/ram/roster/models.py index 52b4e8a..2c7e589 100644 --- a/ram/roster/models.py +++ b/ram/roster/models.py @@ -4,6 +4,7 @@ from uuid import uuid4 from django.db import models from django.urls import reverse from django.dispatch import receiver +from django.utils.safestring import mark_safe # from django.core.files.storage import FileSystemStorage @@ -141,7 +142,12 @@ class RollingStockDocument(models.Model): return "{0}".format(os.path.basename(self.file.name)) def filename(self): - return os.path.basename(self.file.name) + return self.__str__ + + def download(self): + return mark_safe( + "Link".format(self.file.url) + ) class RollingStockImage(models.Model): From 2af772a722ba41dc0d4517dce1e082a159aa5d76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= Date: Mon, 22 Aug 2022 17:12:49 +0200 Subject: [PATCH 3/3] Black'ed --- ram/ram/__init__.py | 2 +- ram/roster/models.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ram/ram/__init__.py b/ram/ram/__init__.py index 39cbfb2..b034ba3 100644 --- a/ram/ram/__init__.py +++ b/ram/ram/__init__.py @@ -1,4 +1,4 @@ from ram.utils import git_suffix -__version__ = "0.0.13" +__version__ = "0.0.14" __version__ += git_suffix(__file__) diff --git a/ram/roster/models.py b/ram/roster/models.py index 2c7e589..51fa700 100644 --- a/ram/roster/models.py +++ b/ram/roster/models.py @@ -146,7 +146,7 @@ class RollingStockDocument(models.Model): def download(self): return mark_safe( - "Link".format(self.file.url) + 'Link'.format(self.file.url) )