X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/dae3dcf87edcfc0648cd0b93b069b0eee67d3ab7..e30813bbb1fce58f29285140bfea2d52d1dc555f:/app/helpers/user_roles_helper.rb diff --git a/app/helpers/user_roles_helper.rb b/app/helpers/user_roles_helper.rb index b6961cd8b..b9430535e 100644 --- a/app/helpers/user_roles_helper.rb +++ b/app/helpers/user_roles_helper.rb @@ -1,27 +1,29 @@ module UserRolesHelper def role_icons(user) - UserRole::ALL_ROLES.reduce("".html_safe) { |a, e| a + " " + role_icon(user, e) } + UserRole::ALL_ROLES.reduce("".html_safe) do |acc, elem| + acc + " " + role_icon(user, elem) + end end def role_icon(user, role) - if @user && @user.administrator? + if current_user&.administrator? if user.has_role?(role) image = "roles/#{role}" - alt = t("user.view.role.revoke.#{role}") - title = t("user.view.role.revoke.#{role}") + alt = t("users.show.role.revoke.#{role}") + title = t("users.show.role.revoke.#{role}") url = revoke_role_path(:display_name => user.display_name, :role => role) confirm = t("user_role.revoke.are_you_sure", :name => user.display_name, :role => role) else image = "roles/blank_#{role}" - alt = t("user.view.role.grant.#{role}") - title = t("user.view.role.grant.#{role}") + alt = t("users.show.role.grant.#{role}") + title = t("users.show.role.grant.#{role}") 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) image = "roles/#{role}" - alt = t("user.view.role.#{role}") - title = t("user.view.role.#{role}") + alt = t("users.show.role.#{role}") + title = t("users.show.role.#{role}") end if image