Merge branch 'master' into flat-pages

ram/portal/views.py

@@ -62,6 +62,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)

ram/ram/__init__.py

@@ -1,4 +1,4 @@
 from ram.utils import git_suffix
 
-__version__ = "0.0.12"
+__version__ = "0.0.14"
 __version__ += git_suffix(__file__)

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 = (

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(
+            '<a href="{0}" target="_blank">Link</a>'.format(self.file.url)
+        )
 
 
 class RollingStockImage(models.Model):