From 524e53616381e06c03dfe07e5ff647fe194ca2d8 Mon Sep 17 00:00:00 2001 From: Henne Vogelsang Date: Fri, 28 Feb 2025 17:21:26 +0100 Subject: [PATCH] Drop displayed_involvement Makes no sense, although groups can't create BsRequest, they can for sure be part of the maintainers of a BsRequest source Project/Package. --- .../webui/groups/bs_requests/index.html.haml | 3 +-- .../webui/shared/bs_requests/_form.html.haml | 3 +-- .../bs_requests/_requests_filter.html.haml | 21 ++++++++----------- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/src/api/app/views/webui/groups/bs_requests/index.html.haml b/src/api/app/views/webui/groups/bs_requests/index.html.haml index 4cdeaa9b86a..efe04c85fae 100644 --- a/src/api/app/views/webui/groups/bs_requests/index.html.haml +++ b/src/api/app/views/webui/groups/bs_requests/index.html.haml @@ -22,5 +22,4 @@ bs_requests_creators: @bs_requests_creators, viewed_object: 'the Group', url: @url, - bs_requests: @bs_requests, - displayed_involvement: %i[incoming review]}) + bs_requests: @bs_requests}) diff --git a/src/api/app/views/webui/shared/bs_requests/_form.html.haml b/src/api/app/views/webui/shared/bs_requests/_form.html.haml index 47659b04bed..f1eb83312a6 100644 --- a/src/api/app/views/webui/shared/bs_requests/_form.html.haml +++ b/src/api/app/views/webui/shared/bs_requests/_form.html.haml @@ -9,8 +9,7 @@ .collapse#content-selector-filters = render partial: 'webui/shared/bs_requests/requests_filter', locals: { selected_filter: selected_filter, url: url, - viewed_object: viewed_object, - displayed_involvement: defined?(displayed_involvement) ? displayed_involvement : %i(incoming outgoing review) } + viewed_object: viewed_object } .col-md-8.col-lg-9.px-0.px-md-3.d-none.content-list-loading = render partial: 'webui/shared/loading', locals: { text: 'Loading...', wrapper_css: ['loading'] } .col-md-8.col-lg-9.px-0.px-md-3.content-list#requests-list diff --git a/src/api/app/views/webui/shared/bs_requests/_requests_filter.html.haml b/src/api/app/views/webui/shared/bs_requests/_requests_filter.html.haml index 0bf07b9c41e..cd79ef56783 100644 --- a/src/api/app/views/webui/shared/bs_requests/_requests_filter.html.haml +++ b/src/api/app/views/webui/shared/bs_requests/_requests_filter.html.haml @@ -8,18 +8,15 @@ = render partial: 'webui/shared/bs_requests/filter_help_involvement', locals: { viewed_object: viewed_object } .px-4.pb-2.accordion-collapse.collapse.show#request-filter-involvement - - if displayed_involvement.include?(:incoming) - = render partial: 'webui/shared/check_box', locals: { label: "To #{viewed_object}", - key: 'involvement[incoming]', name: 'involvement[]', value: 'incoming', - checked: selected_filter[:involvement]&.include?('incoming') } - - if displayed_involvement.include?(:outgoing) - = render partial: 'webui/shared/check_box', locals: { label: "From #{viewed_object}", - key: 'involvement[outgoing]', name: 'involvement[]', value: 'outgoing', - checked: selected_filter[:involvement]&.include?('outgoing') } - - if displayed_involvement.include?(:review) - = render partial: 'webui/shared/check_box', locals: { label: "Review by #{viewed_object}", - key: 'involvement[review]', name: 'involvement[]', value: 'review', - checked: selected_filter[:involvement]&.include?('review') } + = render partial: 'webui/shared/check_box', locals: { label: "To #{viewed_object}", + key: 'involvement[incoming]', name: 'involvement[]', value: 'incoming', + checked: selected_filter[:involvement]&.include?('incoming') } + = render partial: 'webui/shared/check_box', locals: { label: "From #{viewed_object}", + key: 'involvement[outgoing]', name: 'involvement[]', value: 'outgoing', + checked: selected_filter[:involvement]&.include?('outgoing') } + = render partial: 'webui/shared/check_box', locals: { label: "Review by #{viewed_object}", + key: 'involvement[review]', name: 'involvement[]', value: 'review', + checked: selected_filter[:involvement]&.include?('review') } .mt-2.mb-2.accordion-item.border-0.auto-submit-on-change .px-3.py-2.accordion-button.no-style{ data: { 'bs-toggle': 'collapse', 'bs-target': '#request-filter-state' },