Check filters on project monitor

because there is already a default filter active.
openSUSE · Dec 10, 2018 · c1d1ae0 · c1d1ae0
1 parent f74b6a1
commit c1d1ae0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/api/app/views/webui2/webui/project/_monitor_control.html.haml b/src/api/app/views/webui2/webui/project/_monitor_control.html.haml
@@ -9,7 +9,7 @@
           %button.btn.btn-link.monitor-no-filter-link No filter
           - status.each do |status|
             .custom-control.custom-checkbox.dropdown-item.ml-2
-              %input.custom-control-input{ type: :checkbox, id: "#{status}-checkbox".parameterize, checked: false, value: status }
+              %input.custom-control-input{ type: :checkbox, id: "#{status}-checkbox".parameterize, checked: status_filter.include?(status), value: status }
               %label.custom-control-label{ for: "#{status}-checkbox".parameterize }
                 = status
       %span.dropdown#project-monitor-architectures-dropdown
@@ -20,7 +20,7 @@
           %button.btn.btn-link.monitor-no-filter-link No filter
           - architectures.each do |architecture|
             .custom-control.custom-checkbox.dropdown-item.ml-2
-              %input.custom-control-input{ type: :checkbox, id: "#{architecture}-checkbox".parameterize, checked: false, value: architecture }
+              %input.custom-control-input{ type: :checkbox, id: "#{architecture}-checkbox".parameterize, checked: architecture_filter.include?(architecture), value: architecture }
               %label.custom-control-label{ for: "#{architecture}-checkbox".parameterize }
                 = architecture
       %span.dropdown#project-monitor-repositories-dropdown
@@ -31,7 +31,7 @@
           %button.btn.btn-link.monitor-no-filter-link No filter
           - repositories.each do |repository|
             .custom-control.custom-checkbox.dropdown-item.ml-2
-              %input.custom-control-input{ type: :checkbox, id: "#{repository}-checkbox".parameterize, checked: false, value: repository }
+              %input.custom-control-input{ type: :checkbox, id: "#{repository}-checkbox".parameterize, checked: repository_filter.include?(repository), value: repository }
               %label.custom-control-label{ for: "#{repository}-checkbox".parameterize }
                 = repository
       %button.btn.btn-outline-secondary{ data: { toggle: 'modal', target: '#build-monitor-legend' }, title: 'Build status legend' }

diff --git a/src/api/app/views/webui2/webui/project/monitor.html.haml b/src/api/app/views/webui2/webui/project/monitor.html.haml
@@ -7,7 +7,8 @@
   .card-body#project-monitor
     = render partial: 'monitor_control',
       locals: { project: @project, activate_client_search: @activate_client_search,
-      status: @avail_status_values, repositories: @avail_repo_values, architectures: @avail_arch_values }
+      status: @avail_status_values, repositories: @avail_repo_values, architectures: @avail_arch_values,
+      repository_filter: @repo_filter, architecture_filter: @arch_filter, status_filter: @status_filter }
     .row.mt-4
       .col-md-12.obs-dataTable
         %table.table.table-sm.table-striped.table-bordered.text-nowrap.w-100#project-monitor-table