diff options
Diffstat (limited to 'archaeological_operations/views.py')
| -rw-r--r-- | archaeological_operations/views.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py index b7ff857b4..4563f815e 100644 --- a/archaeological_operations/views.py +++ b/archaeological_operations/views.py @@ -96,10 +96,10 @@ def autocomplete_archaeologicalsite(request): qt = Q(reference__icontains=q) | Q(name__icontains=q) query = query & qt limit = 15 - sites = models.ArchaeologicalSite.objects\ - .filter(query).order_by('reference')[:limit] + sites = models.ArchaeologicalSite.objects.filter( + query).order_by('reference')[:limit] data = json.dumps([{'id': site.pk, - 'value': unicode(site)[:60]} + 'value': str(site)[:60]} for site in sites]) return HttpResponse(data, content_type='text/plain') @@ -139,7 +139,7 @@ def autocomplete_operation(request): query = query & extra limit = 15 operations = models.Operation.objects.filter(query)[:limit] - data = json.dumps([{'id': operation.pk, 'value': unicode(operation)} + data = json.dumps([{'id': operation.pk, 'value': str(operation)} for operation in operations]) return HttpResponse(data, content_type='text/plain') @@ -528,10 +528,10 @@ def administrativeactfile_document( template = "" dct['template_form'] = DocumentGenerationAdminActForm( document_type=document_type) - dct['template_error'] = unicode(_( - u"Syntax error on the source template \"{}\" - " - u"contact your administrator and ask him to check " - u"the syntax of this document.")).format(template) + dct['template_error'] = str(_( + "Syntax error on the source template \"{}\" - " + "contact your administrator and ask him to check " + "the syntax of this document.")).format(template) else: dct['search_form'] = search_form() dct['template_form'] = DocumentGenerationAdminActForm( |