Merge pull request #13260 from mollux/fix-missing-grid-filter

fix missing filter on contact grid display
mautic · Jan 25, 2024 · 0f31906 · 0f31906
2 parents 20c2eef + c083469
commit 0f31906
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 38 deletions.
diff --git a/app/bundles/LeadBundle/Resources/views/Lead/_filter.html.twig b/app/bundles/LeadBundle/Resources/views/Lead/_filter.html.twig
@@ -0,0 +1,37 @@
+{% if isIndex %}
+    {% set toolbarButtons = [
+        {
+            'attr': {
+            'class': 'hidden-xs btn btn-default btn-sm btn-nospin',
+            'href': 'javascript: void(0)',
+            'onclick': 'Mautic.toggleLiveLeadListUpdate();',
+            'id': 'liveModeButton',
+            'data-toggle': false,
+            'data-max-id': maxLeadId,
+        },
+            'tooltip': 'mautic.lead.lead.live_update'|trans,
+            'iconClass': 'fa fa-bolt',
+        }
+    ] %}
+    {% if 'list' == indexMode %}
+        {% set toolbarButtons = toolbarButtons|merge([{
+            'attr': {
+                'class': 'hidden-xs btn btn-default btn-sm btn-nospin'~(anonymousShowing ? ' btn-primary' : ''),
+                'href': 'javascript: void(0)',
+                'onclick': 'Mautic.toggleAnonymousLeads();',
+                'id': 'anonymousLeadButton',
+                'data-anonymous': 'mautic.lead.lead.searchcommand.isanonymous'|trans,
+            },
+            'tooltip': 'mautic.lead.lead.anonymous_leads'|trans,
+            'iconClass': 'fa fa-user-secret',
+        }]) %}
+    {% endif %}
+    <div class="panel panel-default bdr-t-wdh-0 mb-0">
+        {{ include('@MauticCore/Helper/list_toolbar.html.twig', {
+            'searchValue': searchValue|default(''),
+            'searchHelp': 'mautic.lead.lead.help.searchcommands',
+            'action': currentRoute,
+            'customButtons': toolbarButtons,
+        }) }}
+        <div class="page-list">
+{% endif %}
diff --git a/app/bundles/LeadBundle/Resources/views/Lead/grid.html.twig b/app/bundles/LeadBundle/Resources/views/Lead/grid.html.twig
@@ -19,6 +19,7 @@
 {% extends isIndex ? '@MauticLead/Lead/list.html.twig' : '@MauticCore/Default/raw_output.html.twig' %}
 
 {% block content %}
+    {{ include('@MauticLead/Lead/_filter.html.twig') }}
 <div class="pa-md bg-auto">
     {% if items|length > 0 %}
         <div class="row shuffle-grid">

diff --git a/app/bundles/LeadBundle/Resources/views/Lead/list.html.twig b/app/bundles/LeadBundle/Resources/views/Lead/list.html.twig
@@ -72,44 +72,7 @@
 {% endblock %}
 
 {% block content %}
-  {% if isIndex %}
-    {% set toolbarButtons = [
-        {
-          'attr': {
-              'class': 'hidden-xs btn btn-default btn-sm btn-nospin',
-              'href': 'javascript: void(0)',
-              'onclick': 'Mautic.toggleLiveLeadListUpdate();',
-              'id': 'liveModeButton',
-              'data-toggle': false,
-              'data-max-id': maxLeadId,
-          },
-          'tooltip': 'mautic.lead.lead.live_update'|trans,
-          'iconClass': 'fa fa-bolt',
-        }
-    ] %}
-    {% if 'list' == indexMode %}
-        {% set toolbarButtons = toolbarButtons|merge([{
-            'attr': {
-                'class': 'hidden-xs btn btn-default btn-sm btn-nospin'~(anonymousShowing ? ' btn-primary' : ''),
-                'href': 'javascript: void(0)',
-                'onclick': 'Mautic.toggleAnonymousLeads();',
-                'id': 'anonymousLeadButton',
-                'data-anonymous': 'mautic.lead.lead.searchcommand.isanonymous'|trans,
-            },
-            'tooltip': 'mautic.lead.lead.anonymous_leads'|trans,
-            'iconClass': 'fa fa-user-secret',
-        }]) %}
-    {% endif %}
-    <div class="panel panel-default bdr-t-wdh-0 mb-0">
-        {{ include('@MauticCore/Helper/list_toolbar.html.twig', {
-                'searchValue': searchValue|default(''),
-                'searchHelp': 'mautic.lead.lead.help.searchcommands',
-                'action': currentRoute,
-                'customButtons': toolbarButtons,
-        }) }}
-        <div class="page-list">
-  {% endif %}
-
+  {{ include('@MauticLead/Lead/_filter.html.twig') }}
   {{ include('@MauticLead/Lead/_list.html.twig') }}
 
   {% if isIndex %}