Skip to content

Commit

Permalink
Merge branch 'development' into staging
Browse files Browse the repository at this point in the history
  • Loading branch information
BertalanD committed Oct 16, 2024
2 parents ba5c27a + 323b42e commit bd1013c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions app/Policies/UserPolicy.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public function viewAll(User $user): bool
Role::SECRETARY,
Role::DIRECTOR,
Role::STUDENT_COUNCIL_SECRETARY,
Role::STUDENT_COUNCIL => Role::STUDENT_COUNCIL_LEADERS,
Role::STUDENT_COUNCIL => array_merge(Role::STUDENT_COUNCIL_LEADERS, Role::COMMITTEE_LEADERS),
]);
}

Expand Down Expand Up @@ -68,7 +68,7 @@ public function viewAny(User $user): bool
Role::WORKSHOP_ADMINISTRATOR,
Role::WORKSHOP_LEADER,
Role::STUDENT_COUNCIL_SECRETARY,
Role::STUDENT_COUNCIL => Role::STUDENT_COUNCIL_LEADERS,
Role::STUDENT_COUNCIL => array_merge(Role::STUDENT_COUNCIL_LEADERS, Role::COMMITTEE_LEADERS),
]);
}

Expand Down Expand Up @@ -102,7 +102,7 @@ public function view(User $user, User $target): bool
return $user->hasRole([
Role::SECRETARY,
Role::DIRECTOR,
Role::STUDENT_COUNCIL => Role::STUDENT_COUNCIL_LEADERS,
Role::STUDENT_COUNCIL => array_merge(Role::STUDENT_COUNCIL_LEADERS, Role::COMMITTEE_LEADERS),
Role::STUDENT_COUNCIL_SECRETARY,
]);
})) || $target->workshops
Expand Down

0 comments on commit bd1013c

Please sign in to comment.