From: mathieu Date: Mon, 2 May 2016 15:22:08 +0000 (+0200) Subject: Fix backend build_query + fix filtres en ligne/acces compte X-Git-Tag: 1.6.2^2~15^2~6^2~12 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=348bd5bb61d2bf828dcd43b81356eba2ee433b9f;p=telemeta.git Fix backend build_query + fix filtres en ligne/acces compte --- diff --git a/telemeta/forms/haystack_form.py b/telemeta/forms/haystack_form.py index 777a37a7..de022559 100644 --- a/telemeta/forms/haystack_form.py +++ b/telemeta/forms/haystack_form.py @@ -226,9 +226,9 @@ class HayAdvanceForm(SearchForm): if self.cleaned_data['viewable']: if self.cleaned_data.get('viewable') == '2': - sqs = sqs.filter(digitized=True).filter(Q(item_acces='full') | Q(item_acces='mixed')) + sqs = sqs.filter(digitized__exact=True).filter(Q(item_acces='full') | Q(item_acces='mixed')) if self.cleaned_data.get('viewable') == '3': - sqs = sqs.filter(digitized=True) + sqs = sqs.filter(digitized__exact=True) if self.cleaned_data['item_status']: if self.cleaned_data.get('item_status') == 'pub': diff --git a/telemeta/util/backend.py b/telemeta/util/backend.py index c2f77577..e8cbffa3 100644 --- a/telemeta/util/backend.py +++ b/telemeta/util/backend.py @@ -26,7 +26,7 @@ import sys class CustomElasticSearchQuery(ElasticsearchSearchQuery): def build_query_fragment(self, field, filter_type, value): - value = re.sub(regexSpacePunc, " ", value) + value = re.sub(regexSpacePunc, " ", str(value)) print("Query fragment :"+ field+ ' '+ filter_type+ ' '+ value) sys.stdout.flush() valeur = super(CustomElasticSearchQuery, self).build_query_fragment(field, filter_type, value)