diff options
Diffstat (limited to 'archaeological_finds/views.py')
| -rw-r--r-- | archaeological_finds/views.py | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py index f440adea6..1a64f1c64 100644 --- a/archaeological_finds/views.py +++ b/archaeological_finds/views.py @@ -171,6 +171,30 @@ def autocomplete_findbasket(request, current_right=None): limit = 20 result = OrderedDict() for query in get_autocomplete_queries(request, ['label']): + query = query & models.FindBasket.get_query_owns( + request.user.ishtaruser) + objects = models.FindBasket.objects.filter(query).distinct().order_by( + 'label')[:limit] + for obj in objects: + if obj.id not in list(result.keys()): + result[obj.id] = obj.label + limit -= 1 + if not limit: + break + if not limit: + break + data = json.dumps([{'id': obj[0], 'value': obj[1]} + for obj in list(result.items())]) + return HttpResponse(data, content_type='text/plain') + + +def autocomplete_findbasket_write(request, current_right=None): + if not request.GET.get('term'): + return HttpResponse(content_type='text/plain') + + limit = 20 + result = OrderedDict() + for query in get_autocomplete_queries(request, ['label']): query = query & models.FindBasket.get_write_query_owns( request.user.ishtaruser) objects = models.FindBasket.objects.filter(query).distinct().order_by( @@ -414,7 +438,7 @@ class OwnBasket(object): class SelectBasketForManagement(IshtarMixin, LoginRequiredMixin, FormView): template_name = 'ishtar/form.html' - form_class = forms.SelectFindBasketForm + form_class = forms.SelectFindBasketWriteForm page_name = _(u"Manage items in basket") def get_form_kwargs(self): |