Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Queue
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Terraform modules
- Incidents

Snippets Groups Projects

ecaf33b1

Commit ecaf33b1 authored Aug 7, 2018 by Otto Visser

Downloads
- Plain Diff

Merge branch 'manager-permissions' into 'development'

Manager permissions - fixes #40

Closes #40

See merge request EIP/queue!82

parents 7a3ea19b c98e5d5c

No related branches found

No related tags found

1 merge request!82Manager permissions - fixes #40

Changes 6

Show whitespace changes

Inline Side-by-side

Showing

src/main/java/nl/tudelft/ewi/queue/controller/CourseController.java 8 additions, 6 deletions

...ava/nl/tudelft/ewi/queue/controller/CourseController.java
src/main/java/nl/tudelft/ewi/queue/controller/HistoryController.java 18 additions, 18 deletions

...va/nl/tudelft/ewi/queue/controller/HistoryController.java
src/main/java/nl/tudelft/ewi/queue/model/Course.java 22 additions, 22 deletions

src/main/java/nl/tudelft/ewi/queue/model/Course.java
src/main/java/nl/tudelft/ewi/queue/service/PermissionService.java 93 additions, 47 deletions

.../java/nl/tudelft/ewi/queue/service/PermissionService.java
src/main/resources/templates/course/create/participant.html 1 addition, 1 deletion

src/main/resources/templates/course/create/participant.html
src/main/resources/templates/course/view/participants.html 1 addition, 1 deletion

src/main/resources/templates/course/view/participants.html

with 143 additions and 95 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please sign in to comment