Skip to content
Snippets Groups Projects
Commit 85c39ce8 authored by Otto Visser's avatar Otto Visser
Browse files

Merge branch '632-can-approve-revoked-requests' into 'development'

Resolve "Can approve revoked Requests"

Closes #632

See merge request !683
parents e9c53fe1 01caadd2
No related branches found
No related tags found
2 merge requests!694Development,!683Resolve "Can approve revoked Requests"
......@@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- File names from parameters are now filtered. [@mmadara](https://gitlab.ewi.tudelft.nl/mmadara)
- Course catalog can now be filtered again. [@rwbackx](https://gitlab.ewi.tudelft.nl/rwbackx)
- Revoked requests could be finished (approved, rejected, etc.) by teachers. [@rwbackx](https://gitlab.ewi.tudelft.nl/rwbackx)
### Deprecated
### Removed
......
......@@ -641,7 +641,8 @@ public class PermissionService {
editions -> withAnyRole(editions, (person, role) -> {
switch (role) {
case TEACHER:
return !request.getEventInfo().getStatus().isHandled();
return !request.getEventInfo().getStatus().isHandled()
&& request.getEventInfo().getStatus() != RequestStatus.REVOKED;
case HEAD_TA:
case TA:
return Objects
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment