From b8572c1701165b3190f91d9da40b27de7a92ce94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= Date: Sun, 1 Oct 2023 21:35:14 +0200 Subject: [PATCH] Rename SKU to 'Item number' --- ram/portal/templates/cards.html | 4 ++-- ram/portal/templates/rollingstock.html | 8 ++++---- ram/portal/views.py | 2 +- ram/roster/admin.py | 10 +++++----- ...0018_rename_sku_rollingstock_item_number.py | 18 ++++++++++++++++++ ram/roster/models.py | 2 +- 6 files changed, 31 insertions(+), 13 deletions(-) create mode 100644 ram/roster/migrations/0018_rename_sku_rollingstock_item_number.py diff --git a/ram/portal/templates/cards.html b/ram/portal/templates/cards.html index 1ba79c5..4c106d6 100644 --- a/ram/portal/templates/cards.html +++ b/ram/portal/templates/cards.html @@ -68,8 +68,8 @@ {{ d.scale }} - SKU - {{ d.sku }} + Item number + {{ d.item_number }} diff --git a/ram/portal/templates/rollingstock.html b/ram/portal/templates/rollingstock.html index 5329dca..fd8827a 100644 --- a/ram/portal/templates/rollingstock.html +++ b/ram/portal/templates/rollingstock.html @@ -105,8 +105,8 @@ {{ rolling_stock.scale }} - SKU - {{ rolling_stock.sku }} + Item number + {{ rolling_stock.item_number }} @@ -155,8 +155,8 @@ {{ rolling_stock.scale }} - SKU - {{ rolling_stock.sku }} + Item number + {{ rolling_stock.item_number }} Era diff --git a/ram/portal/views.py b/ram/portal/views.py index 26cfd2b..b7f56df 100644 --- a/ram/portal/views.py +++ b/ram/portal/views.py @@ -80,7 +80,7 @@ class SearchRoster(View): | Q(rolling_class__description__icontains=s) | Q(rolling_class__type__type__icontains=s) | Q(road_number__icontains=s) - | Q(sku=s) + | Q(item_number=s) | Q(rolling_class__company__name__icontains=s) | Q(rolling_class__company__country__icontains=s) | Q(manufacturer__name__icontains=s) diff --git a/ram/roster/admin.py b/ram/roster/admin.py index 3343c9a..6322f75 100644 --- a/ram/roster/admin.py +++ b/ram/roster/admin.py @@ -68,7 +68,7 @@ class RollingStockDocumentAdmin(admin.ModelAdmin): ) search_fields = ( "rolling_stock__rolling_class__identifier", - "rolling_stock__sku", + "rolling_stock__item_number", "description", "file", ) @@ -89,7 +89,7 @@ class RollingJournalDocumentAdmin(admin.ModelAdmin): search_fields = ( "rolling_stock__rolling_class__identifier", "rolling_stock__road_number", - "rolling_stock__sku", + "rolling_stock__item_number", "log", ) @@ -108,7 +108,7 @@ class RollingStockAdmin(SortableAdminBase, admin.ModelAdmin): "address", "manufacturer", "scale", - "sku", + "item_number", "company", "country", ) @@ -125,7 +125,7 @@ class RollingStockAdmin(SortableAdminBase, admin.ModelAdmin): "manufacturer__name", "road_number", "address", - "sku", + "item_number", ) save_as = True @@ -138,7 +138,7 @@ class RollingStockAdmin(SortableAdminBase, admin.ModelAdmin): "road_number", "scale", "manufacturer", - "sku", + "item_number", "era", "production_year", "purchase_date", diff --git a/ram/roster/migrations/0018_rename_sku_rollingstock_item_number.py b/ram/roster/migrations/0018_rename_sku_rollingstock_item_number.py new file mode 100644 index 0000000..45feed6 --- /dev/null +++ b/ram/roster/migrations/0018_rename_sku_rollingstock_item_number.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.5 on 2023-10-01 19:32 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("roster", "0017_remove_rollingstockimage_is_thumbnail"), + ] + + operations = [ + migrations.RenameField( + model_name="rollingstock", + old_name="sku", + new_name="item_number", + ), + ] diff --git a/ram/roster/models.py b/ram/roster/models.py index 8b99b9c..e2d336e 100644 --- a/ram/roster/models.py +++ b/ram/roster/models.py @@ -82,7 +82,7 @@ class RollingStock(models.Model): limit_choices_to={"category": "model"}, ) scale = models.ForeignKey(Scale, on_delete=models.CASCADE) - sku = models.CharField(max_length=32, blank=True) + item_number = models.CharField(max_length=32, blank=True) decoder_interface = models.PositiveSmallIntegerField( choices=settings.DECODER_INTERFACES, null=True, blank=True )