diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-08-03 17:59:59 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-08-03 17:59:59 +0200 |
commit | 27c69b3032201fac570b1cd3a648266874726554 (patch) | |
tree | c334490e42c8c9e70de4984eb7a0bee82589e058 /ishtar_common/lookups.py | |
parent | 9b05b0bf718c5f0ab0c420660f034d2684f4f63a (diff) | |
download | Ishtar-27c69b3032201fac570b1cd3a648266874726554.tar.bz2 Ishtar-27c69b3032201fac570b1cd3a648266874726554.zip |
Admin: improve files and common
* Town admin: OSM overlay
* add a File lookup
* improve considerably File edition (make it usable)
Diffstat (limited to 'ishtar_common/lookups.py')
-rw-r--r-- | ishtar_common/lookups.py | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/ishtar_common/lookups.py b/ishtar_common/lookups.py index a031af9b3..ef2ff81f1 100644 --- a/ishtar_common/lookups.py +++ b/ishtar_common/lookups.py @@ -1,7 +1,27 @@ from ajax_select import register, LookupChannel +from django.conf import settings from django.db.models import Q -from ishtar_common.models import Person, Organization, IshtarUser +from ishtar_common.models import Person, Organization, IshtarUser, Town + + +@register('town') +class TownLookup(LookupChannel): + model = Town + + def get_query(self, q, request): + if settings.COUNTRY == 'fr': + query = Q() + for term in q.strip().split(' '): + query &= ( + Q(name__icontains=term) | Q(numero_insee__icontains=term) + ) + else: + query = Q(name__icontains=q) + return self.model.objects.filter(query).order_by('name')[:20] + + def format_item_display(self, item): + return u"<span class='ajax-label'>%s</span>" % unicode(item) @register('organization') |