Merge pull request #17224 from ncounter/reorder-filters

Reorder filters
openSUSE · Dec 27, 2024 · 1b040a3 · 1b040a3
2 parents e18c97c + 8801d5d
commit 1b040a3
Showing 1 changed file with 17 additions and 17 deletions.
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
@@ -26,23 +26,6 @@
                                                               value: state,
                                                               checked: selected_filter[:state]&.include?(state.to_s) }
 
-  .mt-2.mb-2.accordion-item.border-0
-    .px-3.py-2.accordion-button.no-style{ data: { 'bs-toggle': 'collapse', 'bs-target': '#request-filter-stag-proj' },
-                                                       aria: { expanded: 'true', controls: 'request-filter-stag-proj' } }
-      %b Staging  Project
-      .selected-content.small.ms-1
-    .px-4.pb-2.accordion-collapse.collapse.show#request-filter-stag-proj
-      .mb-3.ui-front
-        %input.form-control#stag-proj-search{ placeholder: 'Filter staging project' }
-      .scroll-list-wrapper
-        - Project.where.not(staging_workflow_id: nil).each do |sp|
-          .dropdown-item-text.request-filter-stag-proj-item
-            - checked = selected_filter[:staging_project]&.include?(sp.name) || defined?(project) && project == sp
-            = render partial: 'webui/shared/check_box', locals: { label: sp.name,
-                                                                  key: "staging_project[#{sp.id}]", name: 'staging_project[]',
-                                                                  value: sp.name,
-                                                                  checked: checked }
-
   .mt-2.mb-2.accordion-item.border-0
     .px-3.py-2.accordion-button.no-style{ data: { 'bs-toggle': 'collapse', 'bs-target': '#request-filter-action' },
                                                        aria: { expanded: 'true', controls: 'request-filter-action' } }
@@ -114,5 +97,22 @@
                                                                     key: "creators[#{creator}]", name: 'creators[]',
                                                                     value: creator,
                                                                     checked: selected_filter[:creators]&.include?(creator) }
+
+  .mt-2.mb-2.accordion-item.border-0
+    .px-3.py-2.accordion-button.no-style{ data: { 'bs-toggle': 'collapse', 'bs-target': '#request-filter-stag-proj' },
+                                                       aria: { expanded: 'true', controls: 'request-filter-stag-proj' } }
+      %b Staging  Project
+      .selected-content.small.ms-1
+    .px-4.pb-2.accordion-collapse.collapse.show#request-filter-stag-proj
+      .mb-3.ui-front
+        %input.form-control#stag-proj-search{ placeholder: 'Filter staging project' }
+      .scroll-list-wrapper
+        - Project.where.not(staging_workflow_id: nil).each do |sp|
+          .dropdown-item-text.request-filter-stag-proj-item
+            - checked = selected_filter[:staging_project]&.include?(sp.name) || defined?(project) && project == sp
+            = render partial: 'webui/shared/check_box', locals: { label: sp.name,
+                                                                  key: "staging_project[#{sp.id}]", name: 'staging_project[]',
+                                                                  value: sp.name,
+                                                                  checked: checked }
 .text-center.mt-4.mb-4
   = link_to('Clear', url, class: 'btn btn-light border')