summaryrefslogtreecommitdiff
path: root/archaeological_warehouse/views.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-06-02 20:47:30 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-06-02 20:47:30 +0200
commit32ab6d75bd1cd5163e8d21d0d49cd538b36612e0 (patch)
tree3b9881e932b4dabf8da7c30d25feaf8185365e19 /archaeological_warehouse/views.py
parent340f41d071d1477e21c2a829341144a6b84be1a6 (diff)
downloadIshtar-32ab6d75bd1cd5163e8d21d0d49cd538b36612e0.tar.bz2
Ishtar-32ab6d75bd1cd5163e8d21d0d49cd538b36612e0.zip
Pep8
Diffstat (limited to 'archaeological_warehouse/views.py')
-rw-r--r--archaeological_warehouse/views.py34
1 files changed, 17 insertions, 17 deletions
diff --git a/archaeological_warehouse/views.py b/archaeological_warehouse/views.py
index 22eed80e3..aab18ed40 100644
--- a/archaeological_warehouse/views.py
+++ b/archaeological_warehouse/views.py
@@ -21,7 +21,6 @@ import json
from django.db.models import Q
from django.http import HttpResponse
-from django.shortcuts import render_to_response
from django.utils.translation import ugettext_lazy as _
from ishtar_common.views import get_item, new_item
@@ -30,13 +29,14 @@ from wizards import *
from ishtar_common.forms import FinalForm
from forms import *
-get_container = get_item(models.Container,
- 'get_container', 'container',
- extra_request_keys={
- 'location':'location__pk',
- 'container_type':'container_type__pk',
- 'reference':'reference__icontains',
- })
+get_container = get_item(
+ models.Container,
+ 'get_container', 'container',
+ extra_request_keys={
+ 'location': 'location__pk',
+ 'container_type': 'container_type__pk',
+ 'reference': 'reference__icontains',
+ })
new_warehouse = new_item(models.Warehouse, WarehouseForm)
new_container = new_item(models.Container, ContainerForm)
@@ -54,12 +54,12 @@ def autocomplete_warehouse(request):
query = Q()
for q in q.split(' '):
extra = Q(name__icontains=q) | \
- Q(warehouse_type__label__icontains=q)
+ Q(warehouse_type__label__icontains=q)
query = query & extra
limit = 15
warehouses = models.Warehouse.objects.filter(query)[:limit]
- data = json.dumps([{'id':warehouse.pk, 'value':unicode(warehouse)}
- for warehouse in warehouses])
+ data = json.dumps([{'id': warehouse.pk, 'value': unicode(warehouse)}
+ for warehouse in warehouses])
return HttpResponse(data, mimetype='text/plain')
@@ -75,15 +75,15 @@ def autocomplete_container(request):
query = Q()
for q in q.split(' '):
extra = Q(container_type__label__icontains=q) | \
- Q(container_type__reference__icontains=q) | \
- Q(reference__icontains=q) | \
- Q(location__name=q) | \
- Q(location__town=q)
+ Q(container_type__reference__icontains=q) | \
+ Q(reference__icontains=q) | \
+ Q(location__name=q) | \
+ Q(location__town=q)
query = query & extra
limit = 15
containers = models.Container.objects.filter(query)[:limit]
- data = json.dumps([{'id':container.pk, 'value':unicode(container)}
- for container in containers])
+ data = json.dumps([{'id': container.pk, 'value': unicode(container)}
+ for container in containers])
return HttpResponse(data, mimetype='text/plain')
warehouse_packaging_wizard = PackagingWizard.as_view([