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

show toolbar filter after submission (#407)

Browse Source
This commit is contained in:
Kevin Papst
2018-11-11 15:32:41 +01:00
committed by GitHub
parent dc70ff128c
commit 1dabeedaa0
12 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Controller/Admin/ActivityController.php
View File

@@ -61,6 +61,7 @@ class ActivityController extends AbstractController
return $this->render('admin/activity.html.twig', [
'entries' => $entries,
'query' => $query,
'showFilter' => $form->isSubmitted(),
'toolbarForm' => $form->createView(),
]);
}

1
src/Controller/Admin/CustomerController.php
View File

@@ -71,6 +71,7 @@ class CustomerController extends AbstractController
return $this->render('admin/customer.html.twig', [
'entries' => $entries,
'query' => $query,
'showFilter' => $form->isSubmitted(),
'toolbarForm' => $form->createView(),
]);
}

1
src/Controller/Admin/ProjectController.php
View File

@@ -62,6 +62,7 @@ class ProjectController extends AbstractController
return $this->render('admin/project.html.twig', [
'entries' => $entries,
'query' => $query,
'showFilter' => $form->isSubmitted(),
'toolbarForm' => $form->createView(),
]);
}

1
src/Controller/Admin/TimesheetController.php
View File

@@ -75,6 +75,7 @@ class TimesheetController extends AbstractController
'entries' => $entries,
'page' => $page,
'query' => $query,
'showFilter' => $form->isSubmitted(),
'toolbarForm' => $form->createView(),
]);
}

1
src/Controller/Admin/UserController.php
View File

@@ -77,6 +77,7 @@ class UserController extends AbstractController
return $this->render('admin/user.html.twig', [
'entries' => $entries,
'query' => $query,
'showFilter' => $form->isSubmitted(),
'toolbarForm' => $form->createView(),
]);
}

1
src/Controller/TimesheetController.php
View File

@@ -74,6 +74,7 @@ class TimesheetController extends AbstractController
'entries' => $entries,
'page' => $page,
'query' => $query,
'showFilter' => $form->isSubmitted(),
'toolbarForm' => $form->createView(),
]);
}

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

@@ -8,7 +8,7 @@
{% block page_actions %}{{ widgets.page_actions({'filter': '#collapseActivityAdmin', 'visibility': '#modal_activity_admin', 'create': path('admin_activity_create')}) }}{% endblock %}
{% block main_before %}
{{ toolbar.toolbar(toolbarForm, 'collapseActivityAdmin') }}
{{ toolbar.toolbar(toolbarForm, 'collapseActivityAdmin', showFilter) }}
{% endblock %}
{% block main %}

2
templates/admin/customer.html.twig
View File

@@ -8,7 +8,7 @@
{% block page_actions %}{{ widgets.page_actions({'filter': '#collapseCustomerAdmin', 'visibility': '#modal_customer_admin', 'create': path('admin_customer_create')}) }}{% endblock %}
{% block main_before %}
{{ toolbar.toolbar(toolbarForm, 'collapseCustomerAdmin') }}
{{ toolbar.toolbar(toolbarForm, 'collapseCustomerAdmin', showFilter) }}
{% endblock %}
{% block main %}

2
templates/admin/project.html.twig
View File

@@ -8,7 +8,7 @@
{% block page_actions %}{{ widgets.page_actions({'filter': '#collapseProjectAdmin', 'visibility': '#modal_project_admin', 'create': path('admin_project_create')}) }}{% endblock %}
{% block main_before %}
{{ toolbar.toolbar(toolbarForm, 'collapseProjectAdmin') }}
{{ toolbar.toolbar(toolbarForm, 'collapseProjectAdmin', showFilter) }}
{% endblock %}
{% block main %}

2
templates/admin/timesheet.html.twig
View File

@@ -8,7 +8,7 @@
{% block page_actions %}{{ widgets.page_actions({'filter': '#collapseTimesheetAdmin', 'visibility': '#modal_timesheet_admin', 'create': path('admin_timesheet_create')}) }}{% endblock %}
{% block main_before %}
{{ toolbar.toolbar(toolbarForm, 'collapseTimesheetAdmin') }}
{{ toolbar.toolbar(toolbarForm, 'collapseTimesheetAdmin', showFilter) }}
{% endblock %}
{% block main %}

2
templates/admin/user.html.twig
View File

@@ -8,7 +8,7 @@
{% block page_actions %}{{ widgets.page_actions({'filter': '#collapseUserAdmin', 'visibility': '#modal_user_admin', 'create': path('admin_user_create')}) }}{% endblock %}
{% block main_before %}
{{ toolbar.toolbar(toolbarForm, 'collapseUserAdmin') }}
{{ toolbar.toolbar(toolbarForm, 'collapseUserAdmin', showFilter) }}
{% endblock %}
{% block main %}

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

@@ -8,7 +8,7 @@
{% block page_actions %}{{ widgets.page_actions({'filter': '#collapseTimesheet', 'download': 'onclick:return exportTimesheet()', 'visibility': '#modal_timesheet', 'calendar': path('calendar'), 'create': path('timesheet_create')}) }}{% endblock %}
{% block main_before %}
{{ toolbar.toolbar(toolbarForm, 'collapseTimesheet') }}
{{ toolbar.toolbar(toolbarForm, 'collapseTimesheet', showFilter) }}
{% endblock %}
{% block main %}