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

fixes #980

Browse Source
This commit is contained in:
albert
2013-03-19 22:58:46 -07:00
parent 0495d5c338
commit 8dc6d59529
4 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/related_tag.js
View File

@@ -207,12 +207,9 @@
var $dest = $("#artist-tags");
$dest.empty();
if (data.length === 0) {
if (data.length != 1) {
$dest.html("No artists found");
return;
} else if (data.length > 2) {
$dest.html("Too many matching artists found");
return;
}
$.each(data, function(i, json) {

2
app/models/artist.rb
View File

@@ -25,7 +25,7 @@ class Artist < ActiveRecord::Base
while artists.empty? && url.size > 10
u = url.sub(/\/+$/, "") + "/"
u = u.to_escaped_for_sql_like.gsub(/\*/, '%') + '%'
artists += Artist.joins(:urls).where(["artists.is_active = TRUE AND artist_urls.normalized_url LIKE ? ESCAPE E'\\\\'", u]).all(:order => "artists.name")
artists += Artist.joins(:urls).where(["artists.is_active = TRUE AND artist_urls.normalized_url LIKE ? ESCAPE E'\\\\'", u]).all(:order => "artists.name").limit(10)
url = File.dirname(url) + "/"
break if url =~ /pixiv\.net\/$/
end