Unlocked public filters logged-in user created

Author: excelwebzone

src/Resources/views/admin/reports/layout.html.twig

@@ -28,16 +28,22 @@
           {% endif %}
 
           {# main filter #}
-          {% set publicFilters = [
-            {
-              id: 'all',
-              name: 'All Records',
-              params: defaultFilter,
-              isLocked: true,
-              isDefault: true
-            }
-          ] %}
-          {{ UI.filterDropdown(sectionFilter, publicFilters, filters, app.request.get('filters'), defaultFilterUrl|default(null), editFilterUrl|default(null), deleteFilterUrl|default(null)) }}
+          {% if publicFilters is not defined %}
+            {% set publicFilters = [
+              {
+                id: 'all',
+                name: 'All Records',
+                params: defaultFilter,
+                isDefault: true
+              }
+            ] %}
+          {% endif %}
+
+          {% if privateFilters is not defined %}
+            {% set privateFilters = filters %}
+          {% endif %}
+
+          {{ UI.filterDropdown(sectionFilter, publicFilters, privateFilters, app.request.get('filters'), defaultFilterUrl|default(null), editFilterUrl|default(null), deleteFilterUrl|default(null)) }}
         </div>
 
         {# tools/actions #}

src/Resources/views/macros.html.twig

@@ -573,6 +573,7 @@
     {% for filter in publicFilters %}
       {% if defaultFilterId == filter.id %}
         {% set defaultFilter = filter %}
+        {% set defaultIsLocked = app.user.id != filter.user|default({id: null}).id %}
       {% endif %}
     {% endfor %}
     {% if privateFilters is iterable %}
@@ -589,6 +590,7 @@
       {% if filter.isDefault|default(false) %}
         {% set defaultFilterId = filter.id %}
         {% set defaultFilter = filter %}
+        {% set defaultIsLocked = app.user.id != filter.user|default({id: null}).id %}
       {% endif %}
     {% endfor %}
   {% endif %}
@@ -603,6 +605,7 @@
     {% for filter in publicFilters %}
       {% if not defaultFilter and preloadFilters == filter.params|default({})|filter_json_encode %}
         {% set defaultFilter = filter %}
+        {% set defaultIsLocked = app.user.id != filter.user|default({id: null}).id %}
       {% endif %}
     {% endfor %}
     {% if privateFilters is iterable %}
@@ -687,11 +690,11 @@
               filter.name|title,
               filter.params|default({}),
               false,
-              true,
+              app.user.id != filter.user|default({id: null}).id,
               defaultFilterId == filter.id,
               defaultUrl,
-              null,
-              null,
+              editUrl,
+              deleteUrl,
               filter.isDefault|default(false)
             ) }}
           {% endfor %}