Browse Source

CLDC-4071: show change link even when extension number not provided

CLDC-4071-show-telephone-extensions-and-export
Nat Dean-Lewis 2 weeks ago
parent
commit
4f4e2e0c41
  1. 8
      app/helpers/user_helper.rb
  2. 2
      app/views/users/show.html.erb

8
app/helpers/user_helper.rb

@ -89,19 +89,13 @@ module UserHelper
end end
when "phone" when "phone"
edit_link("Enter telephone number", user, current_user) edit_link("Enter telephone number", user, current_user)
when "phone_extension"
if user == current_user || current_user.data_coordinator? || current_user.support?
edit_link("Enter extension number", user, current_user)
else
no_answer_provided_text
end
else else
no_answer_provided_text no_answer_provided_text
end end
end end
def user_action_text(user, attribute) def user_action_text(user, attribute)
return "Change" if %w[role phone phone_extension].include?(attribute) && user.send(attribute).present? return "Change" if (%w[role phone].include?(attribute) && user.send(attribute).present?) || attribute == "phone_extension"
"" ""
end end

2
app/views/users/show.html.erb

@ -68,7 +68,7 @@
<%= summary_list.with_row do |row| <%= summary_list.with_row do |row|
row.with_key { "Extension number" } row.with_key { "Extension number" }
row.with_value { user_details_html(@user, current_user, "phone_extension") } row.with_value { user_details_html(@user, current_user, "phone_extension") }
if UserPolicy.new(current_user, @user).edit_extension_numbers? && @user.phone_extension.present? if UserPolicy.new(current_user, @user).edit_extension_numbers?
row.with_action( row.with_action(
text: user_action_text(@user, "phone_extension"), text: user_action_text(@user, "phone_extension"),
visually_hidden_text: "extension number", visually_hidden_text: "extension number",

Loading…
Cancel
Save