Merge branch 'master' of https://github.com/r888888888/danbooru

app/assets/javascripts/uploads.js

@@ -62,7 +62,7 @@
         var new_artist_link = '<a target="_blank" href="/artists/new?name=' + data.unique_id + '&other_names=' + data.artist_name + '&urls=' + encodeURIComponent(data.profile_url) + '+' + encodeURIComponent(data.image_url) + '">new</a>';
 
         if (data.danbooru_id) {
-          $("#source-record").html('<a href="/artists/' + data.danbooru_id + '">' + data.danbooru_name + '</a>');
+          $("#source-record").html('<a href="/artists/' + data.danbooru_id + '">' + data.danbooru_name + '</a> ' + new_artist_link);
         } else {
           $("#source-record").html(new_artist_link);
         }

app/models/artist.rb

@@ -3,6 +3,7 @@ class Artist < ActiveRecord::Base
   before_save :normalize_name
   after_save :create_version
   after_save :save_url_string
+  after_create :categorize_tag
   validates_uniqueness_of :name
   belongs_to :creator, :class_name => "User"
   has_many :members, :class_name => "Artist", :foreign_key => "group_name", :primary_key => "name"
@@ -10,6 +11,7 @@ class Artist < ActiveRecord::Base
   has_many :versions, :order => "artist_versions.id ASC", :class_name => "ArtistVersion"
   has_one :wiki_page, :foreign_key => "title", :primary_key => "name"
   has_one :tag_alias, :foreign_key => "antecedent_name", :primary_key => "name"
+  has_one :tag, :foreign_key => "name", :primary_key => "name"
   accepts_nested_attributes_for :wiki_page
   attr_accessible :body, :name, :url_string, :other_names, :other_names_comma, :group_name, :wiki_page_attributes, :notes, :as => [:member, :gold, :builder, :platinum, :contributor, :janitor, :moderator, :default, :admin]
   attr_accessible :is_active, :as => [:builder, :contributor, :janitor, :moderator, :default, :admin]
@@ -174,6 +176,10 @@ class Artist < ActiveRecord::Base
     def tag_alias_name
       TagAlias.find_by_antecedent_name(name).consequent_name
     end
+
+    def categorize_tag
+      Tag.find_or_create_by_name("artist:#{name}")
+    end
   end
 
   module BanMethods

test/unit/artist_test.rb

@@ -205,5 +205,12 @@ class ArtistTest < ActiveSupport::TestCase
       artist.reload
       assert_equal("yyy", artist.other_names)
     end
+
+    should "update the category of the tag" do
+      tag = FactoryGirl.create(:tag, :name => "abc")
+      artist = FactoryGirl.create(:artist, :name => "abc")
+      tag.reload
+      assert_equal(Tag.categories.artist, tag.category)
+    end
   end
 end