Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Queue
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
EIP
Labrador
Queue
Commits
85c39ce8
Commit
85c39ce8
authored
Aug 29, 2023
by
Otto Visser
Browse files
Options
Downloads
Plain Diff
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
!694
Development
,
!683
Resolve "Can approve revoked Requests"
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.md
+1
-0
1 addition, 0 deletions
CHANGELOG.md
src/main/java/nl/tudelft/queue/service/PermissionService.java
+2
-1
2 additions, 1 deletion
...main/java/nl/tudelft/queue/service/PermissionService.java
with
3 additions
and
1 deletion
CHANGELOG.md
+
1
−
0
View file @
85c39ce8
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
src/main/java/nl/tudelft/queue/service/PermissionService.java
+
2
−
1
View file @
85c39ce8
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment