summaryrefslogtreecommitdiff
path: root/archaeological_operations/views.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-11-22 16:16:11 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-11-22 16:16:11 +0100
commit17d31c7c5fec183863f2616ca1e86d773205689e (patch)
tree3fb7d5648db2d649e914677a1c866e49dd956abc /archaeological_operations/views.py
parent097c8162391f62489d94ffc92b6c81549d0b547c (diff)
downloadIshtar-17d31c7c5fec183863f2616ca1e86d773205689e.tar.bz2
Ishtar-17d31c7c5fec183863f2616ca1e86d773205689e.zip
autocomplete-operation: fix inadequate default filter
Diffstat (limited to 'archaeological_operations/views.py')
-rw-r--r--archaeological_operations/views.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py
index 1fecce9cd..98da31801 100644
--- a/archaeological_operations/views.py
+++ b/archaeological_operations/views.py
@@ -36,7 +36,7 @@ from forms import *
import models
-def autocomplete_patriarche(request, non_closed=True):
+def autocomplete_patriarche(request):
if (not request.user.has_perm('ishtar_common.view_operation',
models.Operation)
and not request.user.has_perm('ishtar_common.view_own_operation',
@@ -50,8 +50,6 @@ def autocomplete_patriarche(request, non_closed=True):
query = Q()
for q in q.split(' '):
query &= Q(code_patriarche__startswith=q)
- if non_closed:
- query &= Q(end_date__isnull=True)
limit = 15
operations = models.Operation.objects\
.filter(query).order_by('code_patriarche')[:limit]
@@ -88,7 +86,7 @@ new_archaeologicalsite = new_item(models.ArchaeologicalSite,
ArchaeologicalSiteForm, many=True)
-def autocomplete_operation(request, non_closed=True):
+def autocomplete_operation(request):
# person_types = request.user.ishtaruser.person.person_type
if (not request.user.has_perm('ishtar_common.view_operation',
models.Operation)
@@ -117,8 +115,6 @@ def autocomplete_operation(request, non_closed=True):
except ValueError:
pass
query = query & extra
- if non_closed:
- query &= Q(end_date__isnull=True)
limit = 15
operations = models.Operation.objects.filter(query)[:limit]
data = json.dumps([{'id': operation.pk, 'value': unicode(operation)}