Browse Source

Add cancel link text to helpdesk ticket

pull/2572/head
Manny Dinssa 2 years ago
parent
commit
fc9ac9e721
  1. 12
      app/helpers/merge_requests_helper.rb
  2. 2
      app/views/merge_requests/helpdesk_ticket.html.erb

12
app/helpers/merge_requests_helper.rb

@ -6,7 +6,7 @@ module MergeRequestsHelper
def request_details(merge_request)
[
{ label: "Requester", value: display_value_or_placeholder(merge_request.requester&.name) },
{ label: "Helpdesk ticket", value: merge_request.helpdesk_ticket.present? ? link_to("#{merge_request.helpdesk_ticket} (opens in a new tab)", "https://dluhcdigital.atlassian.net/browse/#{merge_request.helpdesk_ticket}", target: "_blank", rel: "noopener noreferrer") : display_value_or_placeholder(nil), action: merge_request.status == "request_merged" ? nil : { text: "Change", href: helpdesk_ticket_merge_request_path(merge_request), visually_hidden_text: "helpdesk ticket" } },
{ label: "Helpdesk ticket", value: merge_request.helpdesk_ticket.present? ? link_to("#{merge_request.helpdesk_ticket} (opens in a new tab)", "https://dluhcdigital.atlassian.net/browse/#{merge_request.helpdesk_ticket}", target: "_blank", rel: "noopener noreferrer") : display_value_or_placeholder(nil), action: merge_request.status == "request_merged" ? nil : { text: "Change", href: helpdesk_ticket_merge_request_path(merge_request, referrer: "check_answers"), visually_hidden_text: "helpdesk ticket" } },
{ label: "Status", value: status_tag(merge_request.status) },
]
end
@ -40,6 +40,16 @@ module MergeRequestsHelper
end
end
def secondary_merge_request_link_text(referrer, skip_for_now=false)
if accessed_from_check_answers?(referrer)
"Cancel"
elsif skip_for_now
"Skip for now"
else
""
end
end
def accessed_from_check_answers?(referrer)
%w[check_answers].include?(referrer)
end

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

@ -18,7 +18,7 @@
<%= f.hidden_field :page, value: "helpdesk_ticket" %>
<div class="govuk-button-group">
<%= f.govuk_submit submit_merge_request_button_text(request.query_parameters["referrer"]) %>
<%= govuk_link_to("Skip for now", merge_request_path(@merge_request)) %>
<%= govuk_link_to(secondary_merge_request_link_text(request.query_parameters["referrer"], skip_for_now=true), merge_request_path(@merge_request)) %>
</div>
</div>
</div>

Loading…
Cancel
Save