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

7a241cf0

You need to sign in or sign up before continuing.

Commit 7a241cf0 authored Sep 15, 2018 by Administrator

Downloads
- Plain Diff

Merge branch 'fix_filters' into 'development'

Fix filters

See merge request EIP/queue!90

parents c4db8594 f7e47925

No related branches found

No related tags found

No related merge requests found

Changes 4

Show whitespace changes

Inline Side-by-side

Showing

src/main/java/nl/tudelft/ewi/queue/controller/RequestController.java 14 additions, 6 deletions

...va/nl/tudelft/ewi/queue/controller/RequestController.java
src/main/java/nl/tudelft/ewi/queue/dialect/FilterExpressionObjectFactory.java 12 additions, 0 deletions

...elft/ewi/queue/dialect/FilterExpressionObjectFactory.java
src/main/java/nl/tudelft/ewi/queue/service/RequestService.java 26 additions, 1 deletion

...ain/java/nl/tudelft/ewi/queue/service/RequestService.java
src/main/resources/templates/request/list.html 6 additions, 4 deletions

src/main/resources/templates/request/list.html

with 58 additions and 11 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