X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/80427b3e5e5ebeecbc0a57a1549a2a33e0c92199..bfffe7ed96e1aba434ca40b488264c43d8f679ff:/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 aee000a97..440d68874 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -11,7 +11,7 @@ <%= number_with_delimiter(current_user.changesets.size) %>
  • - <%= link_to t(".my notes"), :controller => "notes", :action => "mine" %> + <%= link_to t(".my notes"), user_notes_path(@user) %>
  • <%= link_to t(".my traces"), :controller => "traces", :action => "mine" %> @@ -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) %> @@ -53,7 +53,7 @@ <%= number_with_delimiter(@user.changesets.size) %>
  • - <%= link_to t(".notes"), :controller => "notes", :action => "mine" %> + <%= link_to t(".notes"), user_notes_path(@user) %>
  • <%= link_to t(".traces"), :controller => "traces", :action => "index", :display_name => @user.display_name %> @@ -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,39 +111,43 @@ <% end %> - <% if current_user and current_user.administrator? %> + <% if can?(:set_status, User) || can?(:destroy, User) %> <% end %> -

    +

    <%= t ".mapper since" %> <%= l @user.creation_time.to_date, :format => :long %> <% unless @user.terms_agreed %> @@ -164,7 +168,7 @@ <% if current_user and current_user.administrator? -%> -

    +