jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

store search in session (#2735)

Browse Source 
* allow to detect used query filters
* allow to set label in action buttons
* allow to reset last search from session
* migrate invoice archive to new search system
* display number of used search filters
This commit is contained in:
Kevin Papst
2021-08-26 01:37:40 +02:00
committed by GitHub
parent 56524a9773
commit 98a3fc99a2
55 changed files with 365 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/activity/actions.html.twig
View File

@@ -1,6 +1,6 @@
{% macro activities(view) %}
{% macro activities(view, query) %}
{% import "macros/widgets.html.twig" as widgets %}
{% set event = actions(app.user, 'activities', view) %}
{% set event = actions(app.user, 'activities', view, {'query': query}) %}
{{ widgets.page_actions(event.actions) }}
{% endmacro %}

2
templates/activity/index.html.twig
View File

@@ -26,7 +26,7 @@
{% block page_title %}{{ 'admin_activity.title'|trans }}{% endblock %}
{% block page_search %}{{ search.searchModal(toolbarForm) }}{% endblock %}
{% block page_actions %}{{ actions.activities('index') }}{% endblock %}
{% block page_actions %}{{ actions.activities('index', query) }}{% endblock %}
{% block main_before %}
{{ tables.data_table_column_modal(tableName, columns) }}