X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/31edc7dff6f4305366d0f93d35ba3fb1956bb71f..a2abce0f4ac2d88d0b5dc77123b67e59fd67ba68:/app/views/users/show.html.erb?ds=sidebyside diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 87eb9b45f..011226109 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -35,7 +35,7 @@ <% end %> - <% if current_user and current_user.moderator? and current_user.blocks_created.exists? %> + <% if can?(:create, UserBlock) and current_user.blocks_created.exists? %>
  • <%= link_to t(".blocks by me"), :controller => "user_blocks", :action => "blocks_by", :display_name => current_user.display_name %> <%= number_with_delimiter(current_user.blocks_created.active.size) %> @@ -96,7 +96,7 @@
  • <% end %> - <% if current_user and current_user.moderator? %> + <% if can?(:create, UserBlock) %>
  • <%= link_to t(".create_block"), :controller => "user_blocks", :action => "new", :display_name => @user.display_name %>
  • @@ -111,34 +111,38 @@ <% end %> - <% if current_user and current_user.administrator? %> + <% if can?(:set_status, User) || can?(:delete, User) %> <% end %> @@ -179,7 +183,7 @@ <% if current_user and @user.id == current_user.id %> <% if @user.home_lat.nil? or @user.home_lon.nil? %>
    -

    <%= raw(t(".if set location", :settings_link => (link_to t(".settings_link_text"), :controller => "users", :action => "account", :display_name => current_user.display_name))) %>

    +

    <%= t(".if_set_location_html", :settings_link => (link_to t(".settings_link_text"), :controller => "users", :action => "account", :display_name => current_user.display_name)) %>

    <% else %> <% content_for :head do %> @@ -194,7 +198,7 @@ <%= content_tag "div", "", :id => "map", :class => "content_map", :data => { :user => user_data } %> <% end %> - <% friends = @user.friends.collect(&:befriendee) %> + <% friends = @user.friends %> <% nearby = @user.nearby - friends %>