Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
TAM
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
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
EIP
Labrador
TAM
Merge requests
!384
Resolve "Simple Approve/Reject Workflow for Raise Requests"
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Resolve "Simple Approve/Reject Workflow for Raise Requests"
137-simple-approve-reject-workflow-for-raise-requests
into
dev
Overview
35
Commits
15
Pipelines
28
Changes
4
Merged
Danae Savvidi
requested to merge
137-simple-approve-reject-workflow-for-raise-requests
into
dev
6 months ago
Overview
14
Commits
15
Pipelines
28
Changes
4
Expand
Closes
#137 (closed)
#221 (closed)
Removed approve/reject buttons from submitted requests view.
Put banners to confirm that an action has been taken.
How many requests left to review is shown.
A skip button is there to get the next request, the text is changed to "next" if the request has been resolved.
Future improvements to discuss:
Go back button
Reverse action button (if someone clicks approve/reject they should be able to reverse this and skip the request)
Maybe a x/y requests handled instead of z requests left?
Edited
5 months ago
by
Danae Savvidi
0
0
Merge request reports
Compare
dev
version 13
8a260285
5 months ago
version 12
1afc27fa
5 months ago
version 11
63084f2c
5 months ago
version 10
b0d3d3e9
6 months ago
version 9
31841f74
6 months ago
version 8
a0bcf4e5
6 months ago
version 7
7ba668d2
6 months ago
version 6
efe3731a
6 months ago
version 5
8c684365
6 months ago
version 4
8c684365
6 months ago
version 3
58380e51
6 months ago
version 2
3852b9a9
6 months ago
version 1
7bfd68cc
6 months ago
dev (base)
and
latest version
latest version
b9a575db
15 commits,
5 months ago
version 13
8a260285
14 commits,
5 months ago
version 12
1afc27fa
13 commits,
5 months ago
version 11
63084f2c
12 commits,
5 months ago
version 10
b0d3d3e9
11 commits,
6 months ago
version 9
31841f74
10 commits,
6 months ago
version 8
a0bcf4e5
9 commits,
6 months ago
version 7
7ba668d2
8 commits,
6 months ago
version 6
efe3731a
7 commits,
6 months ago
version 5
8c684365
6 commits,
6 months ago
version 4
8c684365
6 commits,
6 months ago
version 3
58380e51
4 commits,
6 months ago
version 2
3852b9a9
3 commits,
6 months ago
version 1
7bfd68cc
1 commit,
6 months ago
4 files
+
120
−
53
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
4
Search (e.g. *.vue) (Ctrl+P)
src/main/resources/templates/raise_request/submitted.html
+
5
−
25
Options
@@ -53,6 +53,11 @@
th:text=
"#{payscale.import}"
data-dialog=
"import-overlay"
></button>
</div>
<script
th:inline=
"javascript"
>
/*<![CDATA[*/
let
requests
=
/*[[${raiseRequests.getContent()}]]*/
[];
/*]]>*/
</script>
<table
class=
"table"
data-style=
"surface"
>
<tr
class=
"table__header"
>
@@ -82,31 +87,6 @@
th:text=
"#{raiseRequest.view}"
class=
"button p-min"
></button>
</td>
<td>
<div
class=
"flex gap-3 justify-end"
>
<form
th:action=
"@{|/raise-request/approve/${request.id}|}"
method=
"post"
>
<button
type=
"submit"
class=
"button p-min"
data-style=
"outlined"
th:aria-label=
"#{general.approve}"
th:text=
"#{general.approve}"
></button>
</form>
<form
th:action=
"@{|/raise-request/reject/${request.id}|}"
method=
"post"
>
<button
type=
"submit"
class=
"button p-min"
data-style=
"outlined"
data-type=
"error"
th:aria-label=
"#{general.reject}"
th:text=
"#{general.reject}"
></button>
</form>
</div>
</td>
</tr>
<tr
th:if=
"${raiseRequests.getTotalElements() == 0}"
>
<td
data-empty=
"true"
colspan=
"6"
th:text=
"#{payscale.empty}"
></td>
Loading