jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix #3174

Browse Source
This commit is contained in:
Type-kun
2017-06-19 18:22:58 +05:00
parent 835f5d5426
commit faa2d99160
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/logical/sources/site.rb
View File

@@ -55,7 +55,9 @@ module Sources
end end
end end
untranslated_tags.reject! {|x| x.blank?} untranslated_tags.reject! {|x| x.blank?}
WikiPage.other_names_equal(untranslated_tags).map{|wiki_page| [wiki_page.title, wiki_page.category_name]} wikis = WikiPage.title_in(untranslated_tags)
wikis += WikiPage.other_names_equal(untranslated_tags)
wikis.uniq.map{|wiki_page| [wiki_page.title, wiki_page.category_name]}
end end
def to_h def to_h

4
app/models/wiki_page.rb
View File

@@ -24,6 +24,10 @@ class WikiPage < ApplicationRecord
where("title = ?", title.mb_chars.downcase.tr(" ", "_")) where("title = ?", title.mb_chars.downcase.tr(" ", "_"))
end end
def title_in(titles)
where("title in (?)", titles.map{|x| x.mb_chars.downcase.tr(" ", "_")} )
end
def active def active
where("is_deleted = false") where("is_deleted = false")
end end