Fix fluid search

glpi-project · Feb 2, 2022 · 817c07d · 817c07d
1 parent 2dacaab
commit 817c07d
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/templates/components/search/display_data.html.twig b/templates/components/search/display_data.html.twig
@@ -29,7 +29,7 @@
  # ---------------------------------------------------------------------
  #}
 
-{% set is_ajax = data['searchform_id'] is defined %}
+{% set is_ajax = data['searchform_id'] is defined and data['searchform_id'] is not null %}
 {% if not is_ajax %}
 <div class="ajax-container search-display-data">
 {% endif %}
@@ -74,8 +74,15 @@
 {% if not is_ajax %}
 </div>
 <script>
-    $(document).on('ready', () => {
-        new GLPI.Search.ResultsView("massform{{ normalized_itemtype }}", GLPI.Search.Table);
-    });
+    if (typeof initFluidSearch !== "function") {
+       window.initFluidSearch = () => {
+           new GLPI.Search.ResultsView("massform{{ normalized_itemtype }}", GLPI.Search.Table);
+       };
+    }
+    if (document.readyState === 'complete') {
+        initFluidSearch();
+    } else {
+        $(document).on('ready', initFluidSearch);
+    }
 </script>
 {% endif %}