Release 2.23.0 (#5075)

templates/macros/datatables.html.twig

@@ -77,9 +77,9 @@
                 {% endif %}
 
                 {% if filterCount > 0 and not form.vars.data.isBookmarkSearch() %}
-                    <button class="{{ searchBtnClass }} text-orange" type="submit" id="resetSearchFilter" name="resetSearchFilter" data-toggle="tooltip" title="{{ 'remove_filter'|trans }}">
+                    <a class="{{ searchBtnClass }} text-orange" href="{{ path(app.request.attributes.get('_route')) }}" data-toggle="tooltip" title="{{ 'remove_filter'|trans }}">
                         {{ icon('cancel') }}
-                    </button>
+                    </a>
                 {% endif %}
             </span>
         </div>

templates/macros/search.html.twig

@@ -16,7 +16,7 @@
             </button>
         {% endif %}
         {% if form.vars.data.countFilter() > 0 and not form.vars.data.isBookmarkSearch() %}
-            <button type="submit" id="resetSearchFilter" name="resetSearchFilter" class="btn btn-icon btn-outline-secondary" data-toggle="tooltip" title="{{ 'remove_filter'|trans }}">{{ icon('cancel', true) }}</button>
+            <a href="{{ path(app.request.attributes.get('_route')) }}" class="btn btn-icon btn-outline-secondary" data-toggle="tooltip" title="{{ 'remove_filter'|trans }}">{{ icon('cancel', true) }}</a>
         {% endif %}
     </div>
     <button type="submit" name="performSearch" value="performSearch" class="performSearch btn btn-primary ms-auto" data-type="submit">{{ 'search'|trans }}</button>

templates/macros/webloader.html.twig

@@ -1,6 +1,6 @@
 {% macro init_frontend_loader() %}
     {% set fdow = app.user is not null ? app.user.firstDayOfWeek : 'monday' %}
-    {% set configurations = javascript_configurations(app.user)|merge({
+    {% set configurations = javascript_configurations(app.user, app.request.locale)|merge({
         login: path('login'),
         direction: tabler_bundle.rightToLeft ? 'rtl' : 'ltr',
         first_dow_iso: iso_day_by_name(fdow),

templates/macros/widgets.html.twig

@@ -542,14 +542,6 @@
     </div>
 {% endmacro %}
 
-{% macro percent(maximum, current) %}
-    {% if maximum > 0 %}
-        {{ (current / (maximum / 100))|number_format(2) }} %
-    {% else %}
-        {{ 0|number_format(2) }} %
-    {% endif %}
-{% endmacro %}
-
 {% macro page_reloader(events, full_reload) %}
     <script type="text/javascript">
         document.addEventListener('kimai.initialized', function() {