Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/pull/5203'
Browse files Browse the repository at this point in the history
  • Loading branch information
tomhughes committed Sep 15, 2024
2 parents 496a872 + 8d77891 commit 33c0e95
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions app/views/users/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 33c0e95

Please sign in to comment.