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
Merge requests
!650
Deploy request history and request filter fix
Code
Review changes
Check out branch
Open in Workspace
Download
Patches
Plain diff
Expand sidebar
Merged
Deploy request history and request filter fix
development
into
master
Overview
0
Commits
2
Pipelines
0
Changes
2
Merged
Deploy request history and request filter fix
Ruben Backx
requested to merge
development
into
master
Mar 30, 2023
Overview
0
Commits
2
Pipelines
0
Changes
2
Forwarded requests were not filtered
Request history did not show names
Edited
Mar 30, 2023
by
Ruben Backx
0
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
2253131e
2 commits,
Mar 30, 2023
2 files
+
5
−
1
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
2
src/main/java/nl/tudelft/queue/controller/RequestController.java
+
4
−
0
View file @ 2253131e
Edit in single-file editor
Open in Web IDE
Show full file
@@ -137,6 +137,8 @@ public class RequestController {
public
String
getRequestTableView
(
Model
model
,
@AuthenticatedPerson
Person
assistant
,
@PageableDefault
(
sort
=
"createdAt"
,
direction
=
Sort
.
Direction
.
DESC
,
size
=
25
)
Pageable
pageable
)
{
model
.
addAttribute
(
"showName"
,
false
);
model
.
addAttribute
(
"showOnlyRelevant"
,
true
);
setRequestTableAttributes
(
model
,
pageable
,
assistant
,
"/requests"
,
r
->
r
.
getEventInfo
().
getStatus
().
isPending
(),
false
,
true
);
return
"request/list"
;
@@ -155,6 +157,8 @@ public class RequestController {
public
String
getRequestTableHistoryView
(
Model
model
,
@AuthenticatedPerson
Person
assistant
,
@PageableDefault
(
sort
=
"createdAt"
,
direction
=
Sort
.
Direction
.
DESC
,
size
=
25
)
Pageable
pageable
)
{
model
.
addAttribute
(
"showName"
,
true
);
model
.
addAttribute
(
"showOnlyRelevant"
,
false
);
setRequestTableAttributes
(
model
,
pageable
,
assistant
,
"/requests/history"
,
r
->
!
r
.
getEventInfo
().
getStatus
().
isPending
(),
true
,
false
);
return
"request/list"
;
Loading