Fix search fields in admin.

oscar_support/admin.py

@@ -2,10 +2,8 @@
 from oscar.core.loading import get_model
 
 Attachment = get_model('oscar_support', 'Attachment')
-Basket = get_model('basket', 'Basket')
 Line = get_model('order', 'Line')
 Message = get_model('oscar_support', 'Message')
-Order = get_model('order', 'Order')
 Priority = get_model("oscar_support", "Priority")
 Product = get_model('catalogue', 'Product')
 RelatedOrder = get_model("oscar_support", "RelatedOrder")
@@ -54,8 +52,8 @@ class TicketStatusAdmin(admin.ModelAdmin):
 
 
 class PriorityAdmin(admin.ModelAdmin):
-    list_display = ['name', 'slug']
-    fields = ['name', 'slug']
+    list_display = ['name', 'slug', 'comment']
+    fields = ['name', 'slug', 'comment']
     readonly_fields = ['slug']
 
 
@@ -72,47 +70,54 @@ class TicketAdmin(admin.ModelAdmin):
     list_filter = ['is_internal', 'requester', 'type', 'assignee', 'priority', 'status']
     raw_id_fields = ['related_lines', 'related_orders', 'related_products']
     readonly_fields = ['date_created', 'date_updated']
-    search_fields = ['is_internal', 'requester', 'type', 'assignee', 'priority', 'status']
+    search_fields = [
+        'is_internal',
+        'requester__username',
+        'type__name',
+        'assignee__username',
+        'priority__name',
+        'status__name'
+    ]
 
 
 class MessageAdmin(admin.ModelAdmin):
     date_hierarchy = 'date_updated'
     list_display = ['user', 'type', 'ticket', 'text']
     list_filter = ['user', 'type', 'ticket']
     readonly_fields = ['date_created', 'date_updated']
-    search_fields = ['user', 'type', 'ticket']
+    search_fields = ['user__username', 'type', 'ticket__number']
 
 
 class RelatedOrderAdmin(admin.ModelAdmin):
     date_hierarchy = 'date_updated'
     list_display = ['user', 'ticket', 'order']
     list_filter = ['user', 'ticket', ]
     readonly_fields = ['date_created', 'date_updated']
-    search_fields = ['user', 'ticket', ]
+    search_fields = ['user__username', 'ticket__number', ]
 
 
 class RelatedOrderLineAdmin(admin.ModelAdmin):
     date_hierarchy = 'date_updated'
     list_display = ['user', 'ticket', 'line']
     list_filter = ['user', 'ticket', ]
     readonly_fields = ['date_created', 'date_updated']
-    search_fields = ['user', 'ticket', ]
+    search_fields = ['user__username', 'ticket__number', ]
 
 
 class RelatedProductAdmin(admin.ModelAdmin):
     date_hierarchy = 'date_updated'
     list_display = ['user', 'ticket', 'product']
     list_filter = ['user', 'ticket', ]
     readonly_fields = ['date_created', 'date_updated']
-    search_fields = ['user', 'ticket', ]
+    search_fields = ['user__username', 'ticket__number', ]
 
 
 class AttachmentAdmin(admin.ModelAdmin):
     date_hierarchy = 'date_updated'
     list_display = ['user', 'ticket', 'file']
     list_filter = ['user', 'ticket', ]
     readonly_fields = ['date_created', 'date_updated']
-    search_fields = ['user', 'ticket', ]
+    search_fields = ['user__username', 'ticket__number', ]
 
 
 admin.site.register(TicketType, TicketTypeAdmin)