diff --git a/app/views/organisations/_merge_request_list.html.erb b/app/views/organisations/_merge_request_list.html.erb index 5926cfd2b..6e4bab9fa 100644 --- a/app/views/organisations/_merge_request_list.html.erb +++ b/app/views/organisations/_merge_request_list.html.erb @@ -1,4 +1,7 @@
+ <% if @merge_requests.empty? %> +

No merge requests

+ <% else %> <%= govuk_table do |table| %> <%= table.with_caption(classes: %w[govuk-!-font-size-19 govuk-!-font-weight-regular]) do |caption| %> <%= @merge_requests.where.not(status: 4).count %> unresolved merge requests @@ -19,33 +22,34 @@ }) %> <% end %> <% end %> - <% @merge_requests.each do |merge_request| %> - <%= table.with_body do |body| %> - <%= body.with_row do |row| %> - <% if merge_request.absorbing_organisation_name.blank? %> - <% row.with_cell(text: "You didn't answer this question", - html_attributes: { - scope: "row", - class: "app-!-colour-muted", - }) %> - <% else %> - <% row.with_cell(text: merge_request.absorbing_organisation_name) %> - <% end %> - <% merge_date = merge_request.merge_date %> - <% if merge_date.nil? %> - <% row.with_cell(text: "You didn't answer this question", - html_attributes: { - scope: "row", - class: "app-!-colour-muted", - }) %> - <% else %> - <% row.with_cell(text: merge_date.strftime("%d %B %Y")) %> - <% end %> - <% row.with_cell(text: status_tag(merge_request.status)) %> - <% row.with_cell(html_attributes: { - scope: "row", - }) do %> - <%= govuk_link_to("View details", "/merge-request/#{merge_request.id}/organisations") %> + <% @merge_requests.each do |merge_request| %> + <%= table.with_body do |body| %> + <%= body.with_row do |row| %> + <% if merge_request.absorbing_organisation_name.blank? %> + <% row.with_cell(text: "You didn't answer this question", + html_attributes: { + scope: "row", + class: "app-!-colour-muted", + }) %> + <% else %> + <% row.with_cell(text: merge_request.absorbing_organisation_name) %> + <% end %> + <% merge_date = merge_request.merge_date %> + <% if merge_date.nil? %> + <% row.with_cell(text: "You didn't answer this question", + html_attributes: { + scope: "row", + class: "app-!-colour-muted", + }) %> + <% else %> + <% row.with_cell(text: merge_date.strftime("%d %B %Y")) %> + <% end %> + <% row.with_cell(text: status_tag(merge_request.status)) %> + <% row.with_cell(html_attributes: { + scope: "row", + }) do %> + <%= govuk_link_to("View details", "/merge-request/#{merge_request.id}/organisations") %> + <% end %> <% end %> <% end %> <% end %>