Skip to content

Commit

Permalink
Merge pull request #8751 from DavidKang/fix-8739-delete-request
Browse files Browse the repository at this point in the history
Display correctly delete requests
  • Loading branch information
coolo committed Nov 20, 2019
2 parents ef6be96 + 5875a2c commit d91c7a4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
7 changes: 6 additions & 1 deletion src/api/app/assets/stylesheets/webui/staging-workflow.scss
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ ul .table-list-group-item {
@extend .w-50;

span.badge {

margin-left: 10px;

a.request {
Expand Down Expand Up @@ -129,6 +128,12 @@ ul .table-list-group-item {
&.state-untracked {
@extend .badge-dark;
}

&.delete {
a.request {
text-decoration: line-through;
}
}
}
a, div.collapse, div.collapsing {
float: left;
Expand Down
1 change: 1 addition & 0 deletions src/api/app/helpers/webui/staging/workflow_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ def create_request_links(request, users_hash, groups_hash)
css = 'ready'
css = 'review' if request[:missing_reviews].present?
css = 'obsolete' if request[:state].in?(BsRequest::OBSOLETE_STATES)
css += ' delete' if request[:request_type] == 'delete'
link_content = [request[:package]]
link_content << reviewers_icon(request, users_hash, groups_hash) if request[:missing_reviews].present?
content_tag(:span, class: "badge state-#{css}") do
Expand Down

0 comments on commit d91c7a4

Please sign in to comment.