X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/a4d3d324ecc2e4535dd1e8fa62bac2bdd2951d5b..fa082dce3aa9ba28b4d3c7abb6a6a4ef4e866418:/app/views/users/show.html.erb diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index c73581b25..d479b1d56 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -81,15 +81,15 @@ <%= link_to t(".comments"), diary_comments_path(@user) %> <span class='badge count-number'><%= number_with_delimiter(@user.diary_comments.size) %></span> </li> - <li> - <% if current_user and current_user.friends_with?(@user) %> - <%= link_to t(".remove as friend"), remove_friend_path(:display_name => @user.display_name), :method => :post %> - <% elsif current_user %> - <%= link_to t(".add as friend"), make_friend_path(:display_name => @user.display_name), :method => :post %> - <% else %> - <%= link_to t(".add as friend"), make_friend_path(:display_name => @user.display_name) %> - <% end %> - </li> + <% if current_user %> + <li> + <% if current_user.friends_with?(@user) %> + <%= link_to t(".remove as friend"), remove_friend_path(:display_name => @user.display_name), :method => :post %> + <% else %> + <%= link_to t(".add as friend"), make_friend_path(:display_name => @user.display_name), :method => :post %> + <% end %> + </li> + <% end %> <% if @user.blocks.exists? %> <li> @@ -217,9 +217,9 @@ <dl class="list-inline"> <dt class="list-inline-item m-0"><%= t ".email address" %></dt> <dd class="list-inline-item"><%= @user.email %></dd> - <% unless @user.creation_ip.nil? -%> + <% unless @user.creation_address.nil? -%> <dt class="list-inline-item m-0"><%= t ".created from" %></dt> - <dd class="list-inline-item"><%= link_to @user.creation_ip, users_path(:ip => @user.creation_ip) %></dd> + <dd class="list-inline-item"><%= link_to @user.creation_address, users_path(:ip => @user.creation_address) %></dd> <% end -%> <dt class="list-inline-item m-0"><%= t ".status" %></dt> <dd class="list-inline-item"><%= link_to @user.status.capitalize, users_path(:status => @user.status) %></dd>