summaryrefslogtreecommitdiff
path: root/archaeological_finds/views.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2019-04-03 18:25:55 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2019-04-03 18:25:55 +0200
commitd38203a78cf15f4cee9c674fe9c73b1aee6f8ece (patch)
treeb38b88c4eee417e5b650569a542689c1e00e4241 /archaeological_finds/views.py
parente889610ca5a4b7963f41b37dbb68ba477dbee884 (diff)
downloadIshtar-d38203a78cf15f4cee9c674fe9c73b1aee6f8ece.tar.bz2
Ishtar-d38203a78cf15f4cee9c674fe9c73b1aee6f8ece.zip
Basket: distinct display - better item numbers
Diffstat (limited to 'archaeological_finds/views.py')
-rw-r--r--archaeological_finds/views.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py
index d4faff71a..e4f8ab66d 100644
--- a/archaeological_finds/views.py
+++ b/archaeological_finds/views.py
@@ -125,7 +125,7 @@ def show_find_extra(request, find):
q = models.FindBasket.objects.filter(items__pk=find.pk).filter(
Q(user=user) | Q(shared_with__pk=user.pk) |
Q(shared_write_with__pk=user.pk)
- )
+ ).distinct()
return {"baskets": [(basket.pk, basket.full_label) for basket in q.all()]}
@@ -147,7 +147,8 @@ def autocomplete_findbasket(request, current_right=None):
limit = 20
query = query & models.FindBasket.get_write_query_owns(
request.user.ishtaruser)
- items = models.FindBasket.objects.filter(query).order_by('label')[:limit]
+ items = models.FindBasket.objects.filter(query).distinct().order_by(
+ 'label')[:limit]
data = json.dumps(
[{'id': item.pk,
'value': u"{} - {}".format(item.label, item.user)[:60]}