summaryrefslogtreecommitdiff
path: root/archaeological_files
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2019-03-09 17:20:37 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2019-06-17 13:21:27 +0200
commit5030a8ea149caa7c7c544bdc492aa276c79eae75 (patch)
treef603c879b5e7d4a82d9602cbdb5143056af01747 /archaeological_files
parent17107d80e46987327741529fe07e6fccba27c302 (diff)
downloadIshtar-5030a8ea149caa7c7c544bdc492aa276c79eae75.tar.bz2
Ishtar-5030a8ea149caa7c7c544bdc492aa276c79eae75.zip
Autocomplete: small fix and general tests
Diffstat (limited to 'archaeological_files')
-rw-r--r--archaeological_files/tests.py18
-rw-r--r--archaeological_files/views.py2
2 files changed, 18 insertions, 2 deletions
diff --git a/archaeological_files/tests.py b/archaeological_files/tests.py
index d78fa0e68..b8755ecbd 100644
--- a/archaeological_files/tests.py
+++ b/archaeological_files/tests.py
@@ -25,7 +25,8 @@ from django.contrib.auth.models import User
from django.core.urlresolvers import reverse
from django.test.client import Client
-from ishtar_common.tests import TestCase, COMMON_FIXTURES, create_superuser
+from ishtar_common.tests import TestCase, COMMON_FIXTURES, create_superuser, \
+ AutocompleteTestBase, AcItem
from ishtar_common.models import Town, IshtarSiteProfile
from archaeological_files import models
@@ -302,3 +303,18 @@ class DashboardTest(TestCase, FileInit):
response = c.get(reverse(url))
self.assertEqual(response.status_code, 200)
+
+
+class AutocompleteTest(AutocompleteTestBase, TestCase):
+ fixtures = FILE_TOWNS_FIXTURES
+ models = [
+ AcItem(models.File, 'autocomplete-file',
+ prepare_func="create_file"),
+ ]
+
+ def create_file(self, base_name):
+ item, __ = models.File.objects.get_or_create(
+ name=base_name,
+ file_type=models.FileType.objects.all()[0]
+ )
+ return item, None
diff --git a/archaeological_files/views.py b/archaeological_files/views.py
index e038c515f..50f3a86d2 100644
--- a/archaeological_files/views.py
+++ b/archaeological_files/views.py
@@ -58,7 +58,7 @@ def autocomplete_file(request):
for q in q.split(' '):
extra = Q(internal_reference__icontains=q) | \
Q(towns__name__icontains=q) | \
- Q(address__icontains=q)
+ Q(address__icontains=q) | Q(name__icontains=q)
try:
int(q)
extra = extra | Q(year=q) | Q(numeric_reference=q)