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

fixes #1359

Browse Source
This commit is contained in:
r888888888
2013-04-19 15:32:20 -07:00
parent c0c2fadf40
commit a7b6dd6de0
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,13 +112,17 @@
} }
if (Danbooru.RelatedTag.recent_artists) { if (Danbooru.RelatedTag.recent_artists) {
var tags = []; var tags = [];
if (Danbooru.RelatedTag.recent_artists.length !== 1) { if (Danbooru.RelatedTag.recent_artists.length === 0) {
tags.push([" none", 0]); tags.push([" none", 0]);
} else { } else if (Danbooru.RelatedTag.recent_artists.length === 1) {
tags.push([Danbooru.RelatedTag.recent_artists[0].name, 1]); tags.push([Danbooru.RelatedTag.recent_artists[0].name, 1]);
$.each(Danbooru.RelatedTag.recent_artists[0].urls, function(i, url) { $.each(Danbooru.RelatedTag.recent_artists[0].urls, function(i, url) {
tags.push([" " + url.url, 0]); tags.push([" " + url.url, 0]);
}); });
} else {
$.each(Danbooru.RelatedTag.recent_artists, function(i, artist) {
tags.push([artist.name, 1]);
});
} }
$dest.append(Danbooru.RelatedTag.build_html("artist", tags, true)); $dest.append(Danbooru.RelatedTag.build_html("artist", tags, true));
} }
@@ -212,7 +216,7 @@
Danbooru.RelatedTag.find_artist = function(e) { Danbooru.RelatedTag.find_artist = function(e) {
$("#artist-tags").html("<em>Loading...</em>"); $("#artist-tags").html("<em>Loading...</em>");
var url = $("#upload_source,#post_source"); var url = $("#upload_source,#post_source");
$.get("/artists.json", {"limit": 2, "search[name]": url.val()}).success(Danbooru.RelatedTag.process_artist); $.get("/artists.json", {"limit": 20, "search[name]": url.val()}).success(Danbooru.RelatedTag.process_artist);
e.preventDefault(); e.preventDefault();
} }

3
app/models/artist.rb
View File

@@ -250,6 +250,9 @@ class Artist < ActiveRecord::Base
when /status:banned/ when /status:banned/
q = q.banned q = q.banned
when /status:active/
q = q.where("is_banned = false and is_deleted = false")
when /./ when /./
q = q.any_name_matches(params[:name]) q = q.any_name_matches(params[:name])
end end