mirror of
https://github.com/daniviga/django-ram.git
synced 2025-08-04 13:17:50 +02:00
Minor fixes
This commit is contained in:
@@ -22,7 +22,7 @@ class DecoderAdmin(admin.ModelAdmin):
|
|||||||
readonly_fields = ("image_thumbnail",)
|
readonly_fields = ("image_thumbnail",)
|
||||||
list_display = ("__str__", "interface")
|
list_display = ("__str__", "interface")
|
||||||
list_filter = ("manufacturer", "interface")
|
list_filter = ("manufacturer", "interface")
|
||||||
search_fields = ("__str__",)
|
search_fields = ("name", "manufacturer__name")
|
||||||
|
|
||||||
|
|
||||||
@admin.register(Scale)
|
@admin.register(Scale)
|
||||||
@@ -59,4 +59,4 @@ class TagAdmin(admin.ModelAdmin):
|
|||||||
class RollingStockTypeAdmin(SortableAdminMixin, admin.ModelAdmin):
|
class RollingStockTypeAdmin(SortableAdminMixin, admin.ModelAdmin):
|
||||||
list_display = ("__str__",)
|
list_display = ("__str__",)
|
||||||
list_filter = ("type", "category")
|
list_filter = ("type", "category")
|
||||||
search_fields = list_display
|
search_fields = ("type", "category")
|
||||||
|
@@ -26,7 +26,7 @@
|
|||||||
{% if i == rolling_stock.paginator.ELLIPSIS %}
|
{% if i == rolling_stock.paginator.ELLIPSIS %}
|
||||||
<li class="page-item"><span class="page-link">{{ i }}</span></li>
|
<li class="page-item"><span class="page-link">{{ i }}</span></li>
|
||||||
{% else %}
|
{% 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 %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
@@ -74,9 +74,9 @@ class GetHomeFiltered(View):
|
|||||||
| Q(rolling_class__company__extended_name__icontains=search)
|
| Q(rolling_class__company__extended_name__icontains=search)
|
||||||
)
|
)
|
||||||
elif _filter == "scale":
|
elif _filter == "scale":
|
||||||
query = Q(scale__scale__icontains=search)
|
query = Q(scale__scale__iexact=search)
|
||||||
elif _filter == "tag":
|
elif _filter == "tag":
|
||||||
query = Q(tags__slug__icontains=search)
|
query = Q(tags__slug__iexact=search)
|
||||||
else:
|
else:
|
||||||
raise Http404
|
raise Http404
|
||||||
rolling_stock = RollingStock.objects.filter(query).order_by(
|
rolling_stock = RollingStock.objects.filter(query).order_by(
|
||||||
|
@@ -20,7 +20,11 @@ class RollingClass(admin.ModelAdmin):
|
|||||||
inlines = (RollingClassPropertyInline,)
|
inlines = (RollingClassPropertyInline,)
|
||||||
list_display = ("__str__", "type", "company")
|
list_display = ("__str__", "type", "company")
|
||||||
list_filter = ("company", "type__category", "type")
|
list_filter = ("company", "type__category", "type")
|
||||||
search_fields = list_display
|
search_fields = (
|
||||||
|
"identifier",
|
||||||
|
"company__name",
|
||||||
|
"type__type",
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class RollingStockDocInline(admin.TabularInline):
|
class RollingStockDocInline(admin.TabularInline):
|
||||||
@@ -62,10 +66,18 @@ class RollingStockAdmin(admin.ModelAdmin):
|
|||||||
list_filter = (
|
list_filter = (
|
||||||
"rolling_class__type__category",
|
"rolling_class__type__category",
|
||||||
"rolling_class__type",
|
"rolling_class__type",
|
||||||
|
"rolling_class__company__name",
|
||||||
"scale",
|
"scale",
|
||||||
"manufacturer",
|
"manufacturer",
|
||||||
)
|
)
|
||||||
search_fields = list_display
|
search_fields = (
|
||||||
|
"rolling_class__identifier",
|
||||||
|
"rolling_class__company__name",
|
||||||
|
"manufacturer__name",
|
||||||
|
"road_number",
|
||||||
|
"address",
|
||||||
|
"sku",
|
||||||
|
)
|
||||||
|
|
||||||
fieldsets = (
|
fieldsets = (
|
||||||
(
|
(
|
||||||
|
Reference in New Issue
Block a user