diff --git a/app/models/follow.rb b/app/models/follow.rb index a7ca4a76b..f11a2a8e7 100644 --- a/app/models/follow.rb +++ b/app/models/follow.rb @@ -25,7 +25,7 @@ class Follow < ActiveRecord::Base interests << tag.name end end - return interests.uniq + interests.uniq end end diff --git a/app/views/follows/_followable_button.html.erb b/app/views/follows/_followable_button.html.erb index 94df2c6ad..e61d9703e 100644 --- a/app/views/follows/_followable_button.html.erb +++ b/app/views/follows/_followable_button.html.erb @@ -2,6 +2,7 @@ <% if show_follow_action? followable %> + <%= link_to "##{follow_link_wrapper_id(followable)}", id: follow_link_wrapper_id(followable), title: follow_entity_text(followable), @@ -16,9 +17,11 @@ method: :post, remote: true, id: follow_link_id(followable) %> + <% end %> <% if show_unfollow_action? followable %> + <% follow = followable.follows.where(user: current_user).first %> <%= link_to "##{unfollow_link_wrapper_id(followable)}", id: unfollow_link_wrapper_id(followable), @@ -33,6 +36,7 @@ method: :delete, remote: true, id: unfollow_link_id(followable) %> + <% end %>