Merge branch 'master' into develop

1 files changed, 2 insertions, 6 deletions

diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py
index c078d910d..f295e0f9d 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]
@@ -89,7 +87,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)
@@ -118,8 +116,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)}