diff --git a/app/views/merge_requests/_merge_request_list.html.erb b/app/views/merge_requests/_merge_request_list.html.erb index 99577bdc3..e048472a7 100644 --- a/app/views/merge_requests/_merge_request_list.html.erb +++ b/app/views/merge_requests/_merge_request_list.html.erb @@ -25,30 +25,18 @@ <% @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) %> + <%= row.with_cell(html_attributes: { scope: "row" }) do %> + <%= display_value_or_placeholder(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")) %> + <%= row.with_cell(html_attributes: { scope: "row" }) do %> + <%= display_value_or_placeholder(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}") %> + <%= govuk_link_to("View details", merge_request_path(merge_request.id)) %> <% end %> <% end %> <% end %>