Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions city_furniture/admin/furniture_signpost.py
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ class FurnitureSignpostPlanAdmin(
raw_id_fields = ("plan", "mount_plan")
list_filter = AbstractFurnitureSignpostAdmin.list_filter
inlines = (FurnitureSignpostPlanFileInline,)
search_fields = ("device_type__code",)


@admin.register(FurnitureSignpostReal)
Expand Down Expand Up @@ -228,6 +229,7 @@ class FurnitureSignpostRealAdmin(
"location_name_fi",
"location_name_en",
"location_name_sw",
"device_type__code",
)
inlines = (FurnitureSignpostRealFileInline, FurnitureSignpostRealOperationInline)
initial_values = {
Expand Down
1 change: 1 addition & 0 deletions traffic_control/admin/additional_sign.py
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ def get_queryset(self, request):

@admin.register(AdditionalSignReal)
class AdditionalSignRealAdmin(
DeviceTypeSearchAdminMixin,
ResponsibleEntityPermissionAdminMixin,
DeviceComparisonAdminMixin,
EnumChoiceValueDisplayAdminMixin,
Expand Down
1 change: 1 addition & 0 deletions traffic_control/admin/barrier.py
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ class BarrierRealOperationInline(TrafficControlOperationInlineBase):

@admin.register(BarrierReal)
class BarrierRealAdmin(
DeviceTypeSearchAdminMixin,
DeviceComparisonAdminMixin,
ResponsibleEntityPermissionAdminMixin,
EnumChoiceValueDisplayAdminMixin,
Expand Down
1 change: 1 addition & 0 deletions traffic_control/admin/road_marking.py
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ class RoadMarkingRealOperationInline(TrafficControlOperationInlineBase):

@admin.register(RoadMarkingReal)
class RoadMarkingRealAdmin(
DeviceTypeSearchAdminMixin,
DeviceComparisonAdminMixin,
ResponsibleEntityPermissionAdminMixin,
EnumChoiceValueDisplayAdminMixin,
Expand Down
1 change: 1 addition & 0 deletions traffic_control/admin/signpost.py
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ class SignpostRealOperationInline(TrafficControlOperationInlineBase):

@admin.register(SignpostReal)
class SignpostRealAdmin(
DeviceTypeSearchAdminMixin,
DeviceComparisonAdminMixin,
ResponsibleEntityPermissionAdminMixin,
EnumChoiceValueDisplayAdminMixin,
Expand Down
1 change: 1 addition & 0 deletions traffic_control/admin/traffic_light.py
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ class TrafficLightRealOperationInline(TrafficControlOperationInlineBase):

@admin.register(TrafficLightReal)
class TrafficLightRealAdmin(
DeviceTypeSearchAdminMixin,
DeviceComparisonAdminMixin,
ResponsibleEntityPermissionAdminMixin,
EnumChoiceValueDisplayAdminMixin,
Expand Down
1 change: 1 addition & 0 deletions traffic_control/admin/traffic_sign.py
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,7 @@ class TrafficSignRealOperationInline(TrafficControlOperationInlineBase):

@admin.register(TrafficSignReal)
class TrafficSignRealAdmin(
DeviceTypeSearchAdminMixin,
DeviceComparisonAdminMixin,
ResponsibleEntityPermissionAdminMixin,
EnumChoiceValueDisplayAdminMixin,
Expand Down
7 changes: 2 additions & 5 deletions traffic_control/mixins/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,5 @@ def delete_queryset(self, request, queryset):


class DeviceTypeSearchAdminMixin:
search_fields = (
"device_type__code",
"device_type__legacy_code",
)
search_help_text = "Searches from code and legacy_code fields"
def get_search_fields(self, request):
return self.search_fields + ("device_type__code", "device_type__legacy_code")
Loading