diff --git a/src/Security/Voter/DispositionVoter.php b/src/Security/Voter/DispositionVoter.php index e22c113..947b8e8 100644 --- a/src/Security/Voter/DispositionVoter.php +++ b/src/Security/Voter/DispositionVoter.php @@ -46,14 +46,19 @@ class DispositionVoter extends Voter $disposition = $subject; return match ($attribute) { - static::VIEW, static::EDIT, static::CONTRACT, static::INVOICE => $this->assertAdministrativeAccess($token) || $this->assertTeamerAccess($token, $disposition), - static::DELETE => $this->assertAdministrativeAccess($token), + static::VIEW, static::EDIT, static::CONTRACT, static::INVOICE => $this->assertAdministrativeAccess() || $this->assertTeamerAccess($token, $disposition), + static::DELETE => $this->assertAdminAccess(), static::FEEDBACK => $this->assertHouseManagerAccess($token, $disposition), default => false, }; } - private function assertAdministrativeAccess(TokenInterface $token): bool + private function assertAdminAccess(): bool + { + return $this->security->isGranted('ROLE_ADMIN'); + } + + private function assertAdministrativeAccess(): bool { return $this->security->isGranted('ROLE_ADMINISTRATIVE'); } diff --git a/templates/administrative/assignment/detail.html.twig b/templates/administrative/assignment/detail.html.twig index cd51357..722d182 100644 --- a/templates/administrative/assignment/detail.html.twig +++ b/templates/administrative/assignment/detail.html.twig @@ -9,100 +9,102 @@
{% include '_partials/_assignment_info_compact.html.twig' %}
-
-

- Bewerbungen -

-
-
- - - - - - - - - - - - {% for application in applications %} + {% if is_granted('ROLE_ADMIN') %} +
+

+ Bewerbungen +

+
+
+
- Name - - Zustieg - - Wünsche - - Status -
+ - - - - - + + + + + - {% else %} - - - - {% endfor %} - -
- - {% include '_partials/_rating_stars.html.twig' with { 'teamer': application.teamer } %} - - {{ application.pickup|bpn_pickup_label|default('-') }} - - {{ application.requests|nl2br|default('-') }} - - {{ ('label.application.status.' ~ application.status)|trans }} - -
- {% if is_granted('DISPOSE', application) %} - - {% endif %} - {% if is_granted('STATUS', application) %} - - {% endif %} - {% if is_granted('DELETE', application) %} - - {% endif %} -
- 		+ Name + + Zustieg + + Wünsche + + Status +
- Es liegen keine Bewerbungen vor... -
+ + + {% for application in applications %} + + + + {% include '_partials/_rating_stars.html.twig' with { 'teamer': application.teamer } %} + + + {{ application.pickup|bpn_pickup_label|default('-') }} + + + {{ application.requests|nl2br|default('-') }} + + + {{ ('label.application.status.' ~ application.status)|trans }} + + +
+ {% if is_granted('DISPOSE', application) %} + + {% endif %} + {% if is_granted('STATUS', application) %} + + {% endif %} + {% if is_granted('DELETE', application) %} + + {% endif %} +
+ + + {% else %} + + + Es liegen keine Bewerbungen vor... + + + {% endfor %} + + +
-
+ {% endif %}

Einteilungen

diff --git a/templates/administrative/assignment/index.html.twig b/templates/administrative/assignment/index.html.twig index 7f415b1..a8593c2 100644 --- a/templates/administrative/assignment/index.html.twig +++ b/templates/administrative/assignment/index.html.twig @@ -49,9 +49,11 @@ {{ knp_pagination_sortable(pagination, 'Bus', 'assignment.pickup') }} - - Bewerbungen - + {% if is_granted('ROLE_ADMIN') %} + + Bewerbungen + + {% endif %} Einteilungen @@ -128,11 +130,13 @@ - {% endif %} - - - {{ assignment.validApplications|length }} - - + {% if is_granted('ROLE_ADMIN') %} + + + {{ assignment.validApplications|length }} + + + {% endif %} {{ assignment.dispositions|length }}/{{ assignment.availableDispositions }}