Minor fixes

This commit is contained in:
2022-07-18 17:07:01 +02:00
parent 1528d1ba56
commit 503a214a4d
4 changed files with 19 additions and 7 deletions

View File

@@ -22,7 +22,7 @@ class DecoderAdmin(admin.ModelAdmin):
readonly_fields = ("image_thumbnail",)
list_display = ("__str__", "interface")
list_filter = ("manufacturer", "interface")
search_fields = ("__str__",)
search_fields = ("name", "manufacturer__name")
@admin.register(Scale)
@@ -59,4 +59,4 @@ class TagAdmin(admin.ModelAdmin):
class RollingStockTypeAdmin(SortableAdminMixin, admin.ModelAdmin):
list_display = ("__str__",)
list_filter = ("type", "category")
search_fields = list_display
search_fields = ("type", "category")

View File

@@ -26,7 +26,7 @@
{% if i == rolling_stock.paginator.ELLIPSIS %}
<li class="page-item"><span class="page-link">{{ i }}</span></li>
{% else %}
<li class="page-item"><a class="page-link" href="{% url 'index_pagination' page=i %}#rolling-stock">{{ i }}</a></li>
<li class="page-item"><a class="page-link" href="{% url 'search_pagination' search=search page=i %}#rolling-stock">{{ i }}</a></li>
{% endif %}
{% endif %}
{% endfor %}

View File

@@ -74,9 +74,9 @@ class GetHomeFiltered(View):
| Q(rolling_class__company__extended_name__icontains=search)
)
elif _filter == "scale":
query = Q(scale__scale__icontains=search)
query = Q(scale__scale__iexact=search)
elif _filter == "tag":
query = Q(tags__slug__icontains=search)
query = Q(tags__slug__iexact=search)
else:
raise Http404
rolling_stock = RollingStock.objects.filter(query).order_by(

View File

@@ -20,7 +20,11 @@ class RollingClass(admin.ModelAdmin):
inlines = (RollingClassPropertyInline,)
list_display = ("__str__", "type", "company")
list_filter = ("company", "type__category", "type")
search_fields = list_display
search_fields = (
"identifier",
"company__name",
"type__type",
)
class RollingStockDocInline(admin.TabularInline):
@@ -62,10 +66,18 @@ class RollingStockAdmin(admin.ModelAdmin):
list_filter = (
"rolling_class__type__category",
"rolling_class__type",
"rolling_class__company__name",
"scale",
"manufacturer",
)
search_fields = list_display
search_fields = (
"rolling_class__identifier",
"rolling_class__company__name",
"manufacturer__name",
"road_number",
"address",
"sku",
)
fieldsets = (
(