From 70e64df878ec0c8ea8aabbeb198ccc1c6d0edb7f Mon Sep 17 00:00:00 2001 From: mathieu Date: Mon, 11 Apr 2016 10:35:22 +0200 Subject: [PATCH] Ajout variable env pour eviter pls rebuild --- app/deploy/app.sh | 4 ++++ env/build.yml | 6 ++---- env/index.env | 1 + telemeta/forms/haystack_form.py | 3 +-- telemeta/locale | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 env/index.env diff --git a/app/deploy/app.sh b/app/deploy/app.sh index d63e67b0..6a95a0b2 100644 --- a/app/deploy/app.sh +++ b/app/deploy/app.sh @@ -33,7 +33,11 @@ python $manage bower_install -- --allow-root python $manage collectstatic --noinput python $manage telemeta-create-admin-user python $manage telemeta-create-boilerplate + +if [ $REINDEX = "True"] +then python $manage rebuild_index --noinput +fi if [ $DEBUG = "False" ] then diff --git a/env/build.yml b/env/build.yml index 3ee1e4c0..b37a2aa2 100644 --- a/env/build.yml +++ b/env/build.yml @@ -22,7 +22,5 @@ # Thomas Fillon app: - build: . - -worker: - build: . + env_file: + ./index.env diff --git a/env/index.env b/env/index.env new file mode 100644 index 00000000..0452bec4 --- /dev/null +++ b/env/index.env @@ -0,0 +1 @@ +REINDEX=False diff --git a/telemeta/forms/haystack_form.py b/telemeta/forms/haystack_form.py index 99a6b74f..ef96ef0a 100644 --- a/telemeta/forms/haystack_form.py +++ b/telemeta/forms/haystack_form.py @@ -42,8 +42,7 @@ class HaySearchForm(FacetedSearchForm): if not re.match('([a-zA-Z]*_?[EI])?_[0-9]{4}_([0-9]{3}_[0-9]{3})?', self.cleaned_data.get('q')): sqs = sqs.filter(content__contains=self.cleaned_data['q']).facet('item_acces').facet('item_status').facet('digitized').facet('recording_context').facet('physical_format').facet('media_type') else: - sqs = sqs.filter(code__exact=self.cleaned_data['q']).facet('item_acces').facet('item_status').facet('digitized').facet('recording_context').facet('physical_format').facet('media_type') - print(self.cleaned_data['q']) + sqs = sqs.filter(code__contains=self.cleaned_data['q']).facet('item_acces').facet('item_status').facet('digitized').facet('recording_context').facet('physical_format').facet('media_type') for facet in self.selected_facets: if ":" not in facet: diff --git a/telemeta/locale b/telemeta/locale index 274422f7..2658531d 160000 --- a/telemeta/locale +++ b/telemeta/locale @@ -1 +1 @@ -Subproject commit 274422f76914dfbee9c02ef969619d397123322d +Subproject commit 2658531de0085822822dfa2ec95da5ab54263461 -- 2.39.5