models: drop various unused #named methods.

This commit is contained in:
evazion
2019-08-15 19:18:19 -05:00
parent 0d7d2cac80
commit bb157f5d5b
7 changed files with 5 additions and 18 deletions

View File

@@ -86,7 +86,6 @@ class WikiPagesController < ApplicationController
redirect_to wiki_page_path(@wiki_page)
else
@wiki_page = WikiPage.new(:title => params[:title])
@artist = Artist.named(@wiki_page.title).active.first
respond_with(@wiki_page)
end
end

View File

@@ -83,7 +83,7 @@ protected
end
def related_tags
tag = Tag.named(query.strip).first
tag = Tag.find_by_name(query.strip)
if tag
tag.related_tag_array.map(&:first)

View File

@@ -464,10 +464,6 @@ class Artist < ApplicationRecord
end
module SearchMethods
def named(name)
where(name: normalize_name(name))
end
def any_other_name_matches(regex)
where(id: Artist.from("unnest(other_names) AS other_name").where("other_name ~ ?", regex))
end

View File

@@ -930,10 +930,6 @@ class Tag < ApplicationRecord
where("tags.name LIKE ? ESCAPE E'\\\\'", normalize_name(name).to_escaped_for_sql_like)
end
def named(name)
where("tags.name = ?", TagAlias.to_aliased([name]).join(""))
end
def search(params)
q = super

View File

@@ -742,10 +742,6 @@ class User < ApplicationRecord
end
module SearchMethods
def named(name)
where("lower(name) = ?", name)
end
def admins
where("level = ?", Levels::ADMIN)
end

View File

@@ -10,8 +10,8 @@
<p>This wiki page does not exist. <%= link_to "Create new wiki page", new_wiki_page_path(:wiki_page => {:title => params[:title]}) %>.</p>
</div>
<% if @artist %>
<p><%= link_to "View artist", @artist %></p>
<% if @wiki_page.artist.present? %>
<p><%= link_to "View artist", @wiki_page.artist %></p>
<% end %>
<%= wiki_page_alias_and_implication_list(@wiki_page)%>

View File

@@ -31,7 +31,7 @@ class RelatedTagQueryTest < ActiveSupport::TestCase
context "for a tag that already exists" do
setup do
Tag.named("aaa").first.update_related
Tag.find_by_name("aaa").update_related
@query = RelatedTagQuery.new(query: "aaa")
end
@@ -60,7 +60,7 @@ class RelatedTagQueryTest < ActiveSupport::TestCase
@wp = FactoryBot.create(:wiki_page, title: "aaa", body: "blah [[foo|blah]] [[FOO]] [[bar]] blah")
@query = RelatedTagQuery.new(query: "xyz")
Tag.named("aaa").first.update_related
Tag.find_by_name("aaa").update_related
end
should "take wiki tags from the consequent's wiki" do