X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/600812f6ad23ab7e1cb3ab25c4b09844ba6daa55..1977e66ace0751b8b4fdf3b55bde367ec33e7c57:/app/views/users/show.html.erb
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 3b330d294..1bd5f8fa5 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -111,7 +111,7 @@
<% end %>
- <% if can?(:set_status, User) || can?(:delete, User) %>
+ <% if can?(:set_status, User) || can?(:destroy, User) %>
<% if can? :set_status, User %>
@@ -138,7 +138,7 @@
<% end %>
<% end %>
- <% if can? :delete, User %>
+ <% if can? :destroy, User %>
-
<%= link_to t(".delete_user"), user_path(:display_name => @user.display_name), :method => :delete, :data => { :confirm => t(".confirm") } %>
@@ -147,7 +147,7 @@
<% end %>
-
+
<%= t ".mapper since" %> <%= l @user.creation_time.to_date, :format => :long %>
<% unless @user.terms_agreed %>
@@ -168,7 +168,7 @@
<% if current_user and current_user.administrator? -%>
-
+
<%= t ".email address" %> <%= @user.email %>
<% unless @user.creation_ip.nil? -%>
<%= t ".created from" %> <%= @user.creation_ip %>
@@ -195,7 +195,7 @@
: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 } %>
+ <%= tag.div "", :id => "map", :class => "content_map", :data => { :user => user_data } %>
<% end %>
<% friends = @user.friends %>