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

cb6e1e07

Commit cb6e1e07 authored Aug 31, 2021 by Otto Visser

Downloads
- Plain Diff

Merge branch '479-display-course-instead-of-edition-on-requests-page' into 'development'

Resolve "Display course instead of edition on requests page"

Closes #479

See merge request !506

parents 9ac71112 6b464457

Branches

Tags

2 merge requests!598Dev to master,!506Resolve "Display course instead of edition on requests page"

Changes 5

Show whitespace changes

Inline Side-by-side

Showing

src/main/java/nl/tudelft/queue/dto/view/RequestViewDTO.java 9 additions, 6 deletions

src/main/java/nl/tudelft/queue/dto/view/RequestViewDTO.java
src/main/java/nl/tudelft/queue/dto/view/requests/LabRequestViewDTO.java 2 additions, 1 deletion

...nl/tudelft/queue/dto/view/requests/LabRequestViewDTO.java
src/main/resources/templates/lab/view/components/full-request-table.html 1 addition, 1 deletion

...ces/templates/lab/view/components/full-request-table.html
src/main/resources/templates/request/list/request-table.html 36 additions, 12 deletions

src/main/resources/templates/request/list/request-table.html
src/test/java/nl/tudelft/queue/controller/LabRequestControllerTest.java 9 additions, 3 deletions

...nl/tudelft/queue/controller/LabRequestControllerTest.java

with 57 additions and 23 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