From a7b6dd6de06adece5a116429e0e016efc035898e Mon Sep 17 00:00:00 2001
From: r888888888 <r888888888@gmail.com>
Date: Fri, 19 Apr 2013 15:32:20 -0700
Subject: [PATCH] fixes #1359

---
 app/assets/javascripts/related_tag.js | 10 +++++++---
 app/models/artist.rb                  |  3 +++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/related_tag.js b/app/assets/javascripts/related_tag.js
index 4754cfb1d..39cd2d7de 100644
--- a/app/assets/javascripts/related_tag.js
+++ b/app/assets/javascripts/related_tag.js
@@ -112,13 +112,17 @@
     }
     if (Danbooru.RelatedTag.recent_artists) {
       var tags = [];
-      if (Danbooru.RelatedTag.recent_artists.length !== 1) {
+      if (Danbooru.RelatedTag.recent_artists.length === 0) {
         tags.push([" none", 0]);
-      } else {
+      } else if (Danbooru.RelatedTag.recent_artists.length === 1) {
         tags.push([Danbooru.RelatedTag.recent_artists[0].name, 1]);
         $.each(Danbooru.RelatedTag.recent_artists[0].urls, function(i, url) {
           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));
     }
@@ -212,7 +216,7 @@
   Danbooru.RelatedTag.find_artist = function(e) {
     $("#artist-tags").html("<em>Loading...</em>");
     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();
   }
 
diff --git a/app/models/artist.rb b/app/models/artist.rb
index dd5514b61..cfefa5691 100644
--- a/app/models/artist.rb
+++ b/app/models/artist.rb
@@ -250,6 +250,9 @@ class Artist < ActiveRecord::Base
       when /status:banned/
         q = q.banned
 
+      when /status:active/
+        q = q.where("is_banned = false and is_deleted = false")
+
       when /./
         q = q.any_name_matches(params[:name])
       end