diff options
Diffstat (limited to 'archaeological_files/views.py')
| -rw-r--r-- | archaeological_files/views.py | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/archaeological_files/views.py b/archaeological_files/views.py index 942ee6ae3..fd0507295 100644 --- a/archaeological_files/views.py +++ b/archaeological_files/views.py @@ -17,7 +17,8 @@ # See the file COPYING for details. -import json, re +import json +import re from django.core.urlresolvers import reverse from django.db.models import Q @@ -32,17 +33,17 @@ from archaeological_operations.models import Operation import models from ishtar_common.wizards import SearchWizard -from archaeological_operations.wizards import is_preventive, is_not_preventive +from archaeological_operations.wizards import AdministrativeActDeletionWizard, \ + is_preventive, is_not_preventive from wizards import * from ishtar_common.forms_common import TownFormset -from archaeological_operations.forms import ParcelFormSet, \ - DocumentGenerationAdminActForm +from archaeological_operations.forms import ParcelFormSet from forms import * -from archaeological_operations.views import generatedoc_administrativeactop -RE_YEAR_INDEX = re.compile(r"([1-2][0-9]{3})-([0-9]+)") # eg.: 2014-123 +RE_YEAR_INDEX = re.compile(r"([1-2][0-9]{3})-([0-9]+)") # eg.: 2014-123 + def autocomplete_file(request): if not request.user.has_perm('ishtar_common.view_file', models.File) and \ @@ -55,10 +56,10 @@ def autocomplete_file(request): query = Q() for q in q.split(' '): extra = Q(internal_reference__icontains=q) | \ - Q(towns__name__icontains=q) | \ - Q(address__icontains=q) + Q(towns__name__icontains=q) | \ + Q(address__icontains=q) try: - value = int(q) + int(q) extra = extra | Q(year=q) | Q(numeric_reference=q) except ValueError: pass @@ -69,8 +70,8 @@ def autocomplete_file(request): query = query & extra limit = 20 files = models.File.objects.filter(query)[:limit] - data = json.dumps([{'id':file.pk, 'value':unicode(file)} - for file in files]) + data = json.dumps([{'id': file.pk, 'value': unicode(file)} + for file in files]) return HttpResponse(data, mimetype='text/plain') get_file = get_item(models.File, 'get_file', 'file', @@ -88,6 +89,7 @@ get_file = get_item(models.File, 'get_file', 'file', },) revert_file = revert_item(models.File) + def extra_file_dct(request, item): dct = {} if (request.user.has_perm('ishtar_common.add_operation', Operation) |