diff --git a/app/helpers/artists_helper.rb b/app/helpers/artists_helper.rb index d9490d71e..cf1e7198d 100644 --- a/app/helpers/artists_helper.rb +++ b/app/helpers/artists_helper.rb @@ -1,11 +1,6 @@ module ArtistsHelper def artist_alias_and_implication_list(artist) - consequent_tag_aliases = TagAlias.where("status in ('active', 'processing') and consequent_name = ?", artist.name) - antecedent_tag_alias = TagAlias.where("status in ('active', 'processing') and antecedent_name = ?", artist.name).first - consequent_tag_implications = TagImplication.where("status in ('active', 'processing') and consequent_name = ?", artist.name) - antecedent_tag_implications = TagImplication.where("status in ('active', 'processing') and antecedent_name = ?", artist.name) - - alias_and_implication_list(antecedent_tag_alias, consequent_tag_aliases, antecedent_tag_implications, consequent_tag_implications) + alias_and_implication_list(artist.tag) end def link_to_artist(name) diff --git a/app/helpers/tags_helper.rb b/app/helpers/tags_helper.rb index 60788bb8d..990f479fb 100644 --- a/app/helpers/tags_helper.rb +++ b/app/helpers/tags_helper.rb @@ -1,28 +1,30 @@ module TagsHelper - def alias_and_implication_list(antecedent_alias, consequent_aliases, antecedent_implications, consequent_implications) + def alias_and_implication_list(tag) + return "" if tag.nil? + html = "" - if antecedent_alias + if tag.antecedent_alias html << "

This tag has been aliased to " - html << link_to(antecedent_alias.consequent_name, show_or_new_wiki_pages_path(:title => antecedent_alias.consequent_name)) + html << link_to(tag.antecedent_alias.consequent_name, show_or_new_wiki_pages_path(:title => tag.antecedent_alias.consequent_name)) html << ".

" end - if consequent_aliases.any? + if tag.consequent_aliases.any? html << "

The following tags are aliased to this tag: " - html << raw(consequent_aliases.map {|x| link_to(x.antecedent_name, show_or_new_wiki_pages_path(:title => x.antecedent_name))}.join(", ")) + html << raw(tag.consequent_aliases.map {|x| link_to(x.antecedent_name, show_or_new_wiki_pages_path(:title => x.antecedent_name))}.join(", ")) html << ".

" end - if antecedent_implications.any? + if tag.antecedent_implications.any? html << "

This tag implicates " - html << raw(antecedent_implications.map {|x| link_to(x.consequent_name, show_or_new_wiki_pages_path(:title => x.consequent_name))}.join(", ")) + html << raw(tag.antecedent_implications.map {|x| link_to(x.consequent_name, show_or_new_wiki_pages_path(:title => x.consequent_name))}.join(", ")) html << ".

" end - if consequent_implications.any? + if tag.consequent_implications.any? html << "

The following tags implicate this tag: " - html << raw(consequent_implications.map {|x| link_to(x.antecedent_name, show_or_new_wiki_pages_path(:title => x.antecedent_name))}.join(", ")) + html << raw(tag.consequent_implications.map {|x| link_to(x.antecedent_name, show_or_new_wiki_pages_path(:title => x.antecedent_name))}.join(", ")) html << ".

" end diff --git a/app/helpers/wiki_pages_helper.rb b/app/helpers/wiki_pages_helper.rb index 24f1c8149..3e55ee9d9 100644 --- a/app/helpers/wiki_pages_helper.rb +++ b/app/helpers/wiki_pages_helper.rb @@ -1,11 +1,6 @@ module WikiPagesHelper def wiki_page_alias_and_implication_list(wiki_page) - antecedent_alias = wiki_page.presenter.antecedent_tag_alias - consequent_aliases = wiki_page.presenter.consequent_tag_aliases - antecedent_implications = wiki_page.presenter.antecedent_tag_implications - consequent_implications = wiki_page.presenter.consequent_tag_implications - - alias_and_implication_list(antecedent_alias, consequent_aliases, antecedent_implications, consequent_implications) + alias_and_implication_list(wiki_page.tag) end def wiki_page_post_previews(wiki_page) diff --git a/app/models/tag.rb b/app/models/tag.rb index 5c8402e6d..f1e9a4fcf 100644 --- a/app/models/tag.rb +++ b/app/models/tag.rb @@ -5,6 +5,10 @@ class Tag < ActiveRecord::Base attr_accessible :category, :as => [:moderator, :janitor, :gold, :platinum, :member, :anonymous, :default, :builder, :admin] attr_accessible :is_locked, :as => [:moderator, :admin] has_one :wiki_page, :foreign_key => "title", :primary_key => "name" + has_one :antecedent_alias, lambda {active}, :class_name => "TagAlias", :foreign_key => "antecedent_name", :primary_key => "name" + has_many :consequent_aliases, lambda {active}, :class_name => "TagAlias", :foreign_key => "consequent_name", :primary_key => "name" + has_many :antecedent_implications, lambda {active}, :class_name => "TagImplication", :foreign_key => "antecedent_name", :primary_key => "name" + has_many :consequent_implications, lambda {active}, :class_name => "TagImplication", :foreign_key => "consequent_name", :primary_key => "name" validates :name, uniqueness: true, tag_name: true, on: :create diff --git a/app/presenters/wiki_page_presenter.rb b/app/presenters/wiki_page_presenter.rb index 95d59aafe..c389b914d 100644 --- a/app/presenters/wiki_page_presenter.rb +++ b/app/presenters/wiki_page_presenter.rb @@ -13,22 +13,6 @@ class WikiPagePresenter DText.strip(excerpt.to_s) end - def consequent_tag_aliases - @consequent_tag_aliases ||= TagAlias.where("status in ('active', 'processing') and consequent_name = ?", wiki_page.title) - end - - def antecedent_tag_alias - @antecedent_tag_alias ||= TagAlias.where("status in ('active', 'processing') and antecedent_name = ?", wiki_page.title).first - end - - def consequent_tag_implications - @consequent_tag_implications ||= TagImplication.where("status in ('active', 'processing') and consequent_name = ?", wiki_page.title) - end - - def antecedent_tag_implications - @antecedent_tag_implications ||= TagImplication.where("status in ('active', 'processing') and antecedent_name = ?", wiki_page.title) - end - # Produce a formatted page that shows the difference between two versions of a page. def diff(other_version) pattern = Regexp.new('(?:<.+?>)|(?:[0-9_A-Za-z\x80-\xff]+[\x09\x20]?)|(?:[ \t]+)|(?:\r?\n)|(?:.+?)')