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.
danidoni · Feb 28, 2025 · 9aabe09 · 9aabe09
1 parent c5a5a19
commit 9aabe09
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 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
@@ -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
@@ -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
@@ -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' },