X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8a9dbc94c84980debfe0e0aa910775724561cd89..8a6c34fa78cf4fa52332d90448dae50087f2b510:/app/helpers/user_roles_helper.rb?ds=sidebyside diff --git a/app/helpers/user_roles_helper.rb b/app/helpers/user_roles_helper.rb index c7516a51c..b870d0273 100644 --- a/app/helpers/user_roles_helper.rb +++ b/app/helpers/user_roles_helper.rb @@ -5,7 +5,7 @@ module UserRolesHelper def role_icon(user, role) if current_user&.administrator? - if user.has_role?(role) + if user.role?(role) image = "roles/#{role}" alt = t("users.show.role.revoke.#{role}") title = t("users.show.role.revoke.#{role}") @@ -18,17 +18,15 @@ module UserRolesHelper url = grant_role_path(:display_name => user.display_name, :role => role) confirm = t("user_role.grant.are_you_sure", :name => user.display_name, :role => role) end - elsif user.has_role?(role) + elsif user.role?(role) image = "roles/#{role}" alt = t("users.show.role.#{role}") title = t("users.show.role.#{role}") end if image - svg_icon = tag.source(:srcset => image_path("#{image}.svg"), :type => "image/svg+xml") - png_icon = image_tag("#{image}.png", :srcset => image_path("#{image}.svg"), :size => "20x20", :border => 0, :alt => alt, :title => title) - icon = tag.picture(svg_icon + png_icon) - icon = link_to(icon, url, :method => :post, :confirm => confirm) if url + icon = image_tag("#{image}.png", :srcset => image_path("#{image}.svg"), :size => "20x20", :border => 0, :alt => alt, :title => title) + icon = link_to(icon, url, :method => :post, :data => { :confirm => confirm }) if url end icon