diff options
Diffstat (limited to 'archaeological_warehouse/lookups.py')
| -rw-r--r-- | archaeological_warehouse/lookups.py | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/archaeological_warehouse/lookups.py b/archaeological_warehouse/lookups.py index ea06db3c5..9b221ea5b 100644 --- a/archaeological_warehouse/lookups.py +++ b/archaeological_warehouse/lookups.py @@ -9,22 +9,21 @@ from django.utils.html import escape from archaeological_warehouse import models -@register('container') +@register("container") class ContainerLookup(LookupChannel): model = models.Container def get_query(self, q, request): query = Q() - for term in q.strip().split(' '): + for term in q.strip().split(" "): subquery = ( - Q(reference__icontains=term) | - Q(container_type__label__icontains=term) | - Q(cached_label__icontains=term) | - Q(responsible__name__icontains=term) + Q(reference__icontains=term) + | Q(container_type__label__icontains=term) + | Q(cached_label__icontains=term) + | Q(responsible__name__icontains=term) ) query &= subquery - return self.model.objects.filter(query).order_by( - 'cached_label')[:20] + return self.model.objects.filter(query).order_by("cached_label")[:20] def format_match(self, obj): return escape(force_text(obj.cached_label)) @@ -33,19 +32,16 @@ class ContainerLookup(LookupChannel): return "<span class='ajax-label'>%s</span>" % item.cached_label -@register('warehouse') +@register("warehouse") class WarehouseLookup(LookupChannel): model = models.Warehouse def get_query(self, q, request): query = Q() - for term in q.strip().split(' '): - subquery = ( - Q(warehouse_type__label=term) | - Q(name__icontains=term) - ) + for term in q.strip().split(" "): + subquery = Q(warehouse_type__label=term) | Q(name__icontains=term) query &= subquery - return self.model.objects.filter(query).order_by('name')[:20] + return self.model.objects.filter(query).order_by("name")[:20] def format_item_display(self, item): return "<span class='ajax-label'>%s</span>" % item.name |