From 55f60e4568f9498a8f018d9329e4dd9a3b15659c Mon Sep 17 00:00:00 2001 From: Toks Date: Wed, 20 May 2015 17:12:20 -0400 Subject: [PATCH] fix #2391 --- app/views/tag_aliases/_listing.html.erb | 2 +- app/views/tag_implications/_listing.html.erb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/tag_aliases/_listing.html.erb b/app/views/tag_aliases/_listing.html.erb index 92ce141cc..e179d3c71 100644 --- a/app/views/tag_aliases/_listing.html.erb +++ b/app/views/tag_aliases/_listing.html.erb @@ -28,7 +28,7 @@ | <%= link_to "Edit", edit_tag_alias_path(tag_alias) %> <% end %> - <% if tag_alias.is_pending? && tag_alias.editable_by?(CurrentUser.user) %> + <% if tag_alias.deletable_by?(CurrentUser.user) %> | <%= link_to "Delete", tag_alias_path(tag_alias), :remote => true, :method => :delete, :data => {:confirm => "Are you sure you want to delete this alias?"} %> <% end %> diff --git a/app/views/tag_implications/_listing.html.erb b/app/views/tag_implications/_listing.html.erb index 8f0a194c2..ffe0006da 100644 --- a/app/views/tag_implications/_listing.html.erb +++ b/app/views/tag_implications/_listing.html.erb @@ -11,8 +11,8 @@ <% tag_implications.each do |tag_implication| %> - <%= link_to tag_implication.antecedent_name, posts_path(:tags => tag_implication.antecedent_name) %> <%= tag_implication.antecedent_tag.post_count rescue 0 %> - <%= link_to tag_implication.consequent_name, posts_path(:tags => tag_implication.consequent_name) %> <%= tag_implication.consequent_tag.post_count rescue 0 %> + <%= link_to tag_implication.antecedent_name, posts_path(:tags => tag_implication.antecedent_name) %> <%= tag_implication.antecedent_tag.post_count rescue 0 %> + <%= link_to tag_implication.consequent_name, posts_path(:tags => tag_implication.consequent_name) %> <%= tag_implication.consequent_tag.post_count rescue 0 %> <% if tag_implication.forum_topic_id %> <%= link_to tag_implication.forum_topic_id, forum_topic_path(tag_implication.forum_topic_id) %>