EP/myep-team
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: keep pagination parameters when returning to previous page

Browse Source
This commit is contained in:
Björn Fromme
2024-06-19 09:05:16 +02:00
parent 590ed2fdc3
commit 83e0986c9a
12 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
templates/administrative/assignment/_form.html.twig
+1 -1
View File
@@ -41,7 +41,7 @@
<button type="submit" class="btn">
Speichern
</button>
<a href="{{ path('app_administrative_assignment_index') }}" class="btn btn--secondary">
<a href="{{ returnUrl }}" class="btn btn--secondary">
Abbrechen
</a>
</div>
templates/administrative/teamer/index.html.twig
+3 -3
View File
@@ -70,12 +70,12 @@
</div>
</td>
<td>
<a href="{{ path('app_administrative_teamer_profile', { 'uuid': teamer.uuid }) }}">
<a href="{{ path('app_administrative_teamer_profile', { 'uuid': teamer.uuid, 'r': return_url() }) }}">
<span class="whitespace-nowrap">{{ teamer.lastName }}</span>
</a>
</td>
<td>
<a href="{{ path('app_administrative_teamer_profile', { 'uuid': teamer.uuid }) }}" class="whitespace-nowrap">
<a href="{{ path('app_administrative_teamer_profile', { 'uuid': teamer.uuid, 'r': return_url() }) }}" class="whitespace-nowrap">
{{ teamer.firstName }}
</a>
</td>
@@ -99,7 +99,7 @@
{{ icon('mask') }}
</a>
{% endif %}
<a href="{{ path('app_administrative_teamer_profile', { 'uuid': teamer.uuid }) }}" title="Teamer:innenprofil {{ teamer }}">
<a href="{{ path('app_administrative_teamer_profile', { 'uuid': teamer.uuid, 'r': return_url() }) }}" title="Teamer:innenprofil {{ teamer }}">
{{ icon('user') }}
</a>
</div>
templates/administrative/teamer/profile.html.twig
+3 -2
View File
@@ -6,10 +6,11 @@
<div class="grid lg:grid-cols-3 gap-y-8 lg:gap-y-0 lg:gap-x-8">
<div>
{% if is_granted('ROLE_MANAGER') %}
{{ knp_menu_render(knp_menu_get('manager_teamer')) }}
{{ knp_menu_render(knp_menu_get('manager_teamer', [], { 'return_url': returnUrl })) }}
{% elseif is_granted('ROLE_ADMIN') %}
{{ knp_menu_render(knp_menu_get('admin_teamer')) }}
{{ knp_menu_render(knp_menu_get('admin_teamer', [], { 'return_url': returnUrl })) }}
{% endif %}
</div>
<div class="lg:col-span-2">
<h1 class="text-2xl font-bold pb-8">