X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/40141993f713944d9a2c471685e44ec6c83bb4ba..7c89e7c0b418c5c4d9692b5e153946571a6ea994:/app/views/users/show.html.erb diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 9f967742e..7e8b45185 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,24 +183,22 @@ <% 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)) %>

    +

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

    <% else %> <% content_for :head do %> <%= javascript_include_tag "user" %> <% end %> - <% - user_data = { - :lon => current_user.home_lon, - :lat => current_user.home_lat, - :icon => image_path("marker-red.png"), - :description => render(:partial => "popup", :object => current_user, :locals => { :type => "your location" }) - } - %> + <% user_data = { + :lon => current_user.home_lon, + :lat => current_user.home_lat, + :icon => image_path("marker-red.png"), + :description => render(:partial => "popup", :object => current_user, :locals => { :type => "your location" }) + } %> <%= 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 %>
    @@ -207,7 +209,7 @@ <% else %>
    <%= render :partial => "contact", :collection => friends, :locals => { :type => "friend" } %> @@ -223,7 +225,7 @@ <% else %>
    <%= render :partial => "contact", :collection => nearby, :locals => { :type => "nearby mapper" } %>