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

fixes #1694

Browse Source
This commit is contained in:
r888888888
2013-05-29 17:01:57 -07:00
parent 178035b8e2
commit 074d126018
2 changed files with 0 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/models/tag_implication.rb
View File

@@ -2,7 +2,6 @@ class TagImplication < ActiveRecord::Base
before_save :update_descendant_names before_save :update_descendant_names
after_save :update_descendant_names_for_parent after_save :update_descendant_names_for_parent
after_destroy :update_descendant_names_for_parent after_destroy :update_descendant_names_for_parent
after_destroy :update_posts_for_destroy
belongs_to :creator, :class_name => "User" belongs_to :creator, :class_name => "User"
before_validation :initialize_creator, :on => :create before_validation :initialize_creator, :on => :create
before_validation :normalize_names before_validation :normalize_names
@@ -100,32 +99,9 @@ class TagImplication < ActiveRecord::Base
end end
end end
module DeletionMethods
extend ActiveSupport::Concern
module ClassMethods
def update_posts_for_destroy(creator_id, creator_ip_addr, antecedent_name, consequent_name)
CurrentUser.scoped(User.find(creator_id), creator_ip_addr) do
Post.tag_match("#{antecedent_name} #{consequent_name} status:any").find_each do |post|
escaped_tag_name = Regexp.escape(consequent_name)
fixed_tags = post.tag_string.sub(/(?:\A| )#{escaped_tag_name}(?:\Z| )/, " ").strip
post.update_attributes(
:tag_string => fixed_tags
)
end
end
end
end
def update_posts_for_destroy
TagImplication.delay(:queue => "default").update_posts_for_destroy(CurrentUser.user.id, CurrentUser.ip_addr, antecedent_name, consequent_name)
end
end
include DescendantMethods include DescendantMethods
include ParentMethods include ParentMethods
extend SearchMethods extend SearchMethods
include DeletionMethods
def initialize_creator def initialize_creator
self.creator_id = CurrentUser.user.id self.creator_id = CurrentUser.user.id

11
test/unit/tag_implication_test.rb
View File

@@ -111,17 +111,6 @@ class TagImplicationTest < ActiveSupport::TestCase
assert_equal("eee", ti4.descendant_names) assert_equal("eee", ti4.descendant_names)
end end
should "update any affected post upon destroy" do
ti1 = FactoryGirl.create(:tag_implication, :antecedent_name => "aaa", :consequent_name => "bbb")
ti2 = FactoryGirl.create(:tag_implication, :antecedent_name => "bbb", :consequent_name => "ccc")
ti3 = FactoryGirl.create(:tag_implication, :antecedent_name => "ccc", :consequent_name => "ddd")
p1 = FactoryGirl.create(:post, :tag_string => "aaa")
assert_equal("aaa bbb ccc ddd", p1.tag_string)
ti2.destroy
p1.reload
assert_equal("aaa bbb ddd", p1.tag_string)
end
should "update any affected post upon save" do should "update any affected post upon save" do
p1 = FactoryGirl.create(:post, :tag_string => "aaa bbb ccc") p1 = FactoryGirl.create(:post, :tag_string => "aaa bbb ccc")
ti1 = FactoryGirl.create(:tag_implication, :antecedent_name => "aaa", :consequent_name => "xxx") ti1 = FactoryGirl.create(:tag_implication, :antecedent_name => "aaa", :consequent_name => "xxx")