Browse Source

CLDC-2588++update soft validation errors in bulk upload (#2577)

* Change table column width with govuk class

* Add html_safe to error message fields
pull/2581/head^2
Manny Dinssa 4 months ago committed by GitHub
parent
commit
bee90d6f99
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 8
      app/components/bulk_upload_error_row_component.html.erb
  2. 2
      app/components/bulk_upload_error_summary_table_component.html.erb

8
app/components/bulk_upload_error_row_component.html.erb

@ -24,8 +24,8 @@
<% critical_errors.each do |error| %> <% critical_errors.each do |error| %>
<% body.with_row do |row| %> <% body.with_row do |row| %>
<% row.with_cell(text: error.cell) %> <% row.with_cell(text: error.cell) %>
<% row.with_cell(text: question_for_field(error.field)) %> <% row.with_cell(text: question_for_field(error.field), html_attributes: { class: "govuk-!-width-one-half" }) %>
<% row.with_cell(text: error.error, html_attributes: { class: "govuk-!-font-weight-bold" }) %> <% row.with_cell(text: error.error.html_safe, html_attributes: { class: "govuk-!-font-weight-bold govuk-!-width-one-half" }) %>
<% row.with_cell(text: error.field.humanize) %> <% row.with_cell(text: error.field.humanize) %>
<% end %> <% end %>
<% end %> <% end %>
@ -54,9 +54,9 @@
<% row_class += " last-row" if index == errors.size - 1 %> <% row_class += " last-row" if index == errors.size - 1 %>
<% body.with_row(html_attributes: { class: row_class }) do |row| %> <% body.with_row(html_attributes: { class: row_class }) do |row| %>
<% row.with_cell(text: error.cell) %> <% row.with_cell(text: error.cell) %>
<% row.with_cell(text: question_for_field(error.field)) %> <% row.with_cell(text: question_for_field(error.field), html_attributes: { class: "govuk-!-width-one-half" }) %>
<% if index == 0 %> <% if index == 0 %>
<% row.with_cell(text: error_message, rowspan: errors.size, html_attributes: { class: "govuk-!-font-weight-bold grouped-multirow-cell" }) %> <% row.with_cell(text: error_message.html_safe, rowspan: errors.size, html_attributes: { class: "govuk-!-font-weight-bold govuk-!-width-one-half grouped-multirow-cell" }) %>
<% end %> <% end %>
<% row.with_cell(text: error.field.humanize) %> <% row.with_cell(text: error.field.humanize) %>
<% end %> <% end %>

2
app/components/bulk_upload_error_summary_table_component.html.erb

@ -12,7 +12,7 @@
<%= table.with_body do |body| %> <%= table.with_body do |body| %>
<% body.with_row do |row| %> <% body.with_row do |row| %>
<% row.with_cell(text: error[0][2]) %> <% row.with_cell(text: error[0][2].html_safe) %>
<% row.with_cell(text: pluralize(error[1], "error"), numeric: true) %> <% row.with_cell(text: pluralize(error[1], "error"), numeric: true) %>
<% end %> <% end %>
<% end %> <% end %>

Loading…
Cancel
Save