Ajout variable env pour eviter pls rebuild

diff --git a/app/deploy/app.sh b/app/deploy/app.sh
index d63e67b0b82a7fe8e7383305493efbc63e3a756b..6a95a0b24d6dd9cf6e751a512516eda2ae9de165 100644 (file)
--- 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 3ee1e4c05a5c1f91b46e199ddfd031cb9a0c0cc8..b37a2aa27f8e76c943b635ea1132361ee6fad6e9 100644 (file)
--- a/env/build.yml
+++ b/env/build.yml
@@ -22,7 +22,5 @@
 # Thomas Fillon <thomas@parisson.com>
 
 app:
-  build: .
-
-worker:
-  build: .
+       env_file:
+               ./index.env

diff --git a/env/index.env b/env/index.env
new file mode 100644 (file)
index 0000000..0452bec
--- /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 99a6b74faecb55f14d1330491b98ab5bf453053d..ef96ef0a8e22c09411c8243b30fdd50ca6885908 100644 (file)
--- 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 274422f76914dfbee9c02ef969619d397123322d..2658531de0085822822dfa2ec95da5ab54263461 160000 (submodule)
--- a/telemeta/locale
+++ b/telemeta/locale
@@ -1 +1 @@
-Subproject commit 274422f76914dfbee9c02ef969619d397123322d
+Subproject commit 2658531de0085822822dfa2ec95da5ab54263461