Rebase

gip-inclusion · Feb 23, 2024 · 9adb75d · 9adb75d
1 parent 7517100
commit 9adb75d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/lemarche/siaes/management/commands/set_search_vector_field.py b/lemarche/siaes/management/commands/set_search_vector_field.py
@@ -21,7 +21,7 @@ def handle(self, *args, **options):
         self.stdout_info("Reseting search_vector field...")
         progress = 0
         for i in range(0, SIAE_COUNT, RANGE_STEP):  # to avoid memory issues
-            for siae in Siae.objects.prefetch_related("sectors", "offers", "labels").all()[i, i + RANGE_STEP]:
+            for siae in Siae.objects.prefetch_related("sectors", "offers", "labels").all()[i : i + RANGE_STEP]:  # noqa
                 siae_search_vector = (
                     SearchVector(
                         Value(siae.name, output_field=models.CharField()),

diff --git a/...aes/migrations/0066_siae_search_vector.py → ...aes/migrations/0072_siae_search_vector.py b/...aes/migrations/0066_siae_search_vector.py → ...aes/migrations/0072_siae_search_vector.py
@@ -6,7 +6,7 @@
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("siaes", "0065_siae_legal_form"),
+        ("siaes", "0071_alter_siae_kind"),
     ]
 
     operations = [

diff --git a/...067_siae_siaes_siae_search__200779_gin.py → ...073_siae_siaes_siae_search__200779_gin.py b/...067_siae_siaes_siae_search__200779_gin.py → ...073_siae_siaes_siae_search__200779_gin.py
@@ -6,7 +6,7 @@
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("siaes", "0066_siae_search_vector"),
+        ("siaes", "0072_siae_search_vector"),
     ]
 
     operations = [

diff --git a/lemarche/templates/siaes/search_results.html b/lemarche/templates/siaes/search_results.html
@@ -201,9 +201,9 @@
                             </form>
                         </div>
                         <div class="tab-pane fade"
-                             id="search-full-text-1"
+                             id="search-text"
                              role="tabpanel"
-                             aria-labelledby="search-full-text-1-tab">
+                             aria-labelledby="search-text-tab">
                             <form method="GET"
                                   action="{% url 'siae:search_results' %}"
                                   id="text-search-form"
@@ -430,6 +430,9 @@ <h1 class="h4 mb-0">
     // first tab
     let searchFilterTab = document.getElementById('search-filter-tab');
     let searchFilterContent = document.getElementById('search-filter');
+    // second tab
+    let searchTextTab = document.getElementById('search-text-tab');
+    let searchTextContent = document.getElementById('search-text');
     // third tab
     let searchFullText1Tab = document.getElementById('search-full-text-1-tab');
     let searchFullText1Content = document.getElementById('search-full-text-1');