Browse Source

Fix lint offence

pull/2565/head
Manny Dinssa 2 years ago
parent
commit
107a03e6a7
  1. 6
      app/views/merge_requests/_details_list.html.erb
  2. 2
      app/views/merge_requests/_summary_card.html.erb
  3. 8
      app/views/merge_requests/details.html.erb

6
app/views/merge_requests/_details_list.html.erb

@ -1,7 +1,7 @@
<%= govuk_summary_list do |summary_list| %> <%= govuk_summary_list do |summary_list| %>
<% details.each do |detail| %> <% details.each do |detail| %>
<% summary_list.with_row do |row| %> <% summary_list.with_row do |row| %>
<% row.with_key { detail[:label]} %> <% row.with_key { detail[:label] } %>
<% row.with_value do %> <% row.with_value do %>
<div class="govuk-!-margin-left-8 govuk-!-margin-right-4"> <div class="govuk-!-margin-left-8 govuk-!-margin-right-4">
@ -19,8 +19,8 @@
<% row.with_action( <% row.with_action(
text: detail[:action][:text], text: detail[:action][:text],
href: detail[:action][:href], href: detail[:action][:href],
visually_hidden_text: detail[:action][:visually_hidden_text], visually_hidden_text: detail[:action][:visually_hidden_text]
) %> ) %>
<% end %> <% end %>
<% end %> <% end %>
<% end %> <% end %>

2
app/views/merge_requests/_summary_card.html.erb

@ -3,6 +3,6 @@
<h3 class="govuk-summary-card__title govuk-!-font-weight-regular"><%= title %></h3> <h3 class="govuk-summary-card__title govuk-!-font-weight-regular"><%= title %></h3>
</div> </div>
<div class="govuk-summary-card__content"> <div class="govuk-summary-card__content">
<%= render partial: "merge_requests/details_list", locals: { details: details } %> <%= render partial: "merge_requests/details_list", details: details %>
</div> </div>
</div> </div>

8
app/views/merge_requests/details.html.erb

@ -16,7 +16,7 @@
<% if @merge_request.dpo_user %> <% if @merge_request.dpo_user %>
Contact the Data Protection Officer: <%= link_to @merge_request.dpo_user.name, user_path(@merge_request.dpo_user.id) %> Contact the Data Protection Officer: <%= link_to @merge_request.dpo_user.name, user_path(@merge_request.dpo_user.id) %>
<% else %> <% else %>
<%= @merge_request.absorbing_organisation_name %> does not have a Data Protection Officer. You can assign one on the <%= link_to 'users page', "#{organisation_path(@merge_request.absorbing_organisation_id)}/users" %>. <%= @merge_request.absorbing_organisation_name %> does not have a Data Protection Officer. You can assign one on the <%= link_to "users page", "#{organisation_path(@merge_request.absorbing_organisation_id)}/users" %>.
<% end %> <% end %>
</div> </div>
</div> </div>
@ -25,7 +25,7 @@
<span class="govuk-caption-l">Merge details</span> <span class="govuk-caption-l">Merge details</span>
<%= @merge_request.absorbing_organisation_name %> <%= @merge_request.absorbing_organisation_name %>
</h1> </h1>
<% unless @merge_request.status == "request_merged"%> <% unless @merge_request.status == "request_merged" %>
<div class="govuk-button-group"> <div class="govuk-button-group">
<button type="submit" <%= @merge_request.status == "ready_to_merge" ? "" : "disabled aria-disabled=\"true\"" %> class="govuk-button" data-module="govuk-button"> <button type="submit" <%= @merge_request.status == "ready_to_merge" ? "" : "disabled aria-disabled=\"true\"" %> class="govuk-button" data-module="govuk-button">
Begin merge Begin merge
@ -46,7 +46,7 @@
<% merge_details = [ <% merge_details = [
{ label: "Absorbing organisation", value: display_value_or_placeholder(@merge_request.absorbing_organisation_name), action: @merge_request.status == "request_merged" ? nil : { text: "Change", href: "#", visually_hidden_text: "absorbing organisation" } }, { label: "Absorbing organisation", value: display_value_or_placeholder(@merge_request.absorbing_organisation_name), action: @merge_request.status == "request_merged" ? nil : { text: "Change", href: "#", visually_hidden_text: "absorbing organisation" } },
{ label: "Merging organisations", value: @merge_request.other_merging_organisations.present? ? @merge_request.other_merging_organisations.split(',').map(&:strip).join('<br>').html_safe : display_value_or_placeholder(nil), action: @merge_request.status == "request_merged" ? nil : { text: "Change", href: "#", visually_hidden_text: "merging organisations" } }, { label: "Merging organisations", value: @merge_request.other_merging_organisations.present? ? @merge_request.other_merging_organisations.split(",").map(&:strip).join("<br>").html_safe : display_value_or_placeholder(nil), action: @merge_request.status == "request_merged" ? nil : { text: "Change", href: "#", visually_hidden_text: "merging organisations" } },
{ label: "Merge date", value: display_value_or_placeholder(@merge_request.merge_date), action: @merge_request.status == "request_merged" ? nil : { text: "Change", href: "#", visually_hidden_text: "merge date" } }, { label: "Merge date", value: display_value_or_placeholder(@merge_request.merge_date), action: @merge_request.status == "request_merged" ? nil : { text: "Change", href: "#", visually_hidden_text: "merge date" } },
] %> ] %>
@ -57,7 +57,7 @@
{ label: "Total users after merge", value: display_value_or_placeholder(@merge_request.total_users), action: { text: "View", href: "#", visually_hidden_text: "total users after merge" } }, { label: "Total users after merge", value: display_value_or_placeholder(@merge_request.total_users), action: { text: "View", href: "#", visually_hidden_text: "total users after merge" } },
{ label: "Total schemes after merge", value: display_value_or_placeholder(@merge_request.total_schemes), action: { text: "View", href: "#", visually_hidden_text: "total schemes after merge" } }, { label: "Total schemes after merge", value: display_value_or_placeholder(@merge_request.total_schemes), action: { text: "View", href: "#", visually_hidden_text: "total schemes after merge" } },
{ label: "Total logs after merge", value: @merge_request.total_lettings_logs.present? || @merge_request.total_sales_logs.present? ? "#{@merge_request.total_lettings_logs} lettings logs<br>#{@merge_request.total_sales_logs} sales logs".html_safe : display_value_or_placeholder(nil), action: { text: "View", href: "#", visually_hidden_text: "total logs after merge" } }, { label: "Total logs after merge", value: @merge_request.total_lettings_logs.present? || @merge_request.total_sales_logs.present? ? "#{@merge_request.total_lettings_logs} lettings logs<br>#{@merge_request.total_sales_logs} sales logs".html_safe : display_value_or_placeholder(nil), action: { text: "View", href: "#", visually_hidden_text: "total logs after merge" } },
{ label: "Total stock owners & managing agents after merge", value: @merge_request.total_stock_owners.present? || @merge_request.total_managing_agents.present? ? "#{@merge_request.total_stock_owners} stock owners<br>#{@merge_request.total_managing_agents} managing agents".html_safe : display_value_or_placeholder(nil), action: { text: "View", href: "#", visually_hidden_text: "total stock owners & managing agents after merge" } } { label: "Total stock owners & managing agents after merge", value: @merge_request.total_stock_owners.present? || @merge_request.total_managing_agents.present? ? "#{@merge_request.total_stock_owners} stock owners<br>#{@merge_request.total_managing_agents} managing agents".html_safe : display_value_or_placeholder(nil), action: { text: "View", href: "#", visually_hidden_text: "total stock owners & managing agents after merge" } },
] %> ] %>
<%= render partial: "merge_requests/summary_card", locals: { title: "Merge outcomes", details: merge_outcomes } %> <%= render partial: "merge_requests/summary_card", locals: { title: "Merge outcomes", details: merge_outcomes } %>

Loading…
Cancel
Save