Add the excluded requests to staging workflow view

Co-authored-by: Saray Cabrera Padrón <scabrerapadron@suse.de>
openSUSE · Nov 20, 2018 · f00754c · f00754c
1 parent 2f94231
commit f00754c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/api/app/controllers/webui/staging/workflows_controller.rb b/src/api/app/controllers/webui/staging/workflows_controller.rb
@@ -38,8 +38,8 @@ def show
     @more_unassigned_requests = @staging_workflow.unassigned_requests.count - @unassigned_requests.size
     @ready_requests = @staging_workflow.ready_requests.first(5)
     @more_ready_requests = @staging_workflow.ready_requests.count - @ready_requests.size
-    @ignored_requests = @staging_workflow.ignored_requests.first(5)
-    @more_ignored_requests = @staging_workflow.ignored_requests.count - @ignored_requests.size
+    @excluded_requests = @staging_workflow.excluded_requests.first(5)
+    @more_excluded_requests = @staging_workflow.excluded_requests.count - @excluded_requests.size
     @empty_projects = @staging_workflow.staging_projects.without_staged_requests
     @managers = @staging_workflow.managers_group
   end

diff --git a/src/api/app/views/webui2/webui/staging/workflows/_infos.html.haml b/src/api/app/views/webui2/webui/staging/workflows/_infos.html.haml
@@ -18,6 +18,6 @@
       -# TODO: add link to see the full list of ready requests
       %dd= render 'requests_list', requests: ready_requests, more_requests: more_ready_requests
 
-      %dt Ignored:
-      -# TODO: add link when IgnoredRequest model is done
-      %dd= render 'requests_list', requests: ignored_requests, more_requests: more_ignored_requests
+      %dt Excluded:
+      -# TODO: add link when ExcludedRequest model is done
+      %dd= render 'requests_list', requests: excluded_requests, more_requests: more_excluded_requests
diff --git a/src/api/app/views/webui2/webui/staging/workflows/show.html.haml b/src/api/app/views/webui2/webui/staging/workflows/show.html.haml
@@ -27,5 +27,5 @@
     = render partial: 'infos', locals: { staging_workflow: @staging_workflow, empty_projects: @empty_projects,
                                          unassigned_requests: @unassigned_requests, more_unassigned_requests: @more_unassigned_requests,
                                          ready_requests: @ready_requests, more_ready_requests: @more_ready_requests,
-                                         ignored_requests: @ignored_requests, more_ignored_requests: @more_ignored_requests,
+                                         excluded_requests: @excluded_requests, more_excluded_requests: @more_excluded_requests,
                                          project: @project, managers: @managers }