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

fixes #2468: Aliases/implications with errors

Browse Source
This commit is contained in:
r888888888
2015-08-25 16:27:03 -07:00
parent 06ef466e53
commit 478c0e2397
2 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/models/tag_alias.rb
View File

@@ -81,17 +81,18 @@ class TagAlias < ActiveRecord::Base
unless valid? unless valid?
raise errors.full_messages.join("; ") raise errors.full_messages.join("; ")
end end
update_column(:status, "processing")
move_aliases_and_implications
clear_all_cache
ensure_category_consistency
update_posts
admin = CurrentUser.user || User.admins.first admin = CurrentUser.user || User.admins.first
CurrentUser.scoped(admin, "127.0.0.1") do CurrentUser.scoped(admin, "127.0.0.1") do
update_column(:status, "processing")
move_aliases_and_implications
clear_all_cache
ensure_category_consistency
update_posts
update_forum_topic_for_approve if update_topic update_forum_topic_for_approve if update_topic
update_column(:post_count, consequent_tag.post_count)
update_column(:status, "active")
end end
update_column(:post_count, consequent_tag.post_count)
update_column(:status, "active")
rescue Exception => e rescue Exception => e
update_column(:status, "error: #{e}") update_column(:status, "error: #{e}")
NewRelic::Agent.notice_error(e, :custom_params => {:tag_alias_id => id, :antecedent_name => antecedent_name, :consequent_name => consequent_name}) NewRelic::Agent.notice_error(e, :custom_params => {:tag_alias_id => id, :antecedent_name => antecedent_name, :consequent_name => consequent_name})

22
app/models/tag_implication.rb
View File

@@ -124,11 +124,15 @@ class TagImplication < ActiveRecord::Base
unless valid? unless valid?
raise errors.full_messages.join("; ") raise errors.full_messages.join("; ")
end end
update_column(:status, "processing")
update_posts admin = CurrentUser.user || User.admins.first
update_column(:status, "active") CurrentUser.scoped(admin, "127.0.0.1") do
update_descendant_names_for_parents update_column(:status, "processing")
update_forum_topic_for_approve if update_topic update_posts
update_column(:status, "active")
update_descendant_names_for_parents
update_forum_topic_for_approve if update_topic
end
rescue Exception => e rescue Exception => e
update_column(:status, "error: #{e}") update_column(:status, "error: #{e}")
NewRelic::Agent.notice_error(e, :custom_params => {:tag_implication_id => id, :antecedent_name => antecedent_name, :consequent_name => consequent_name}) NewRelic::Agent.notice_error(e, :custom_params => {:tag_implication_id => id, :antecedent_name => antecedent_name, :consequent_name => consequent_name})
@@ -219,9 +223,11 @@ class TagImplication < ActiveRecord::Base
def update_forum_topic_for_approve def update_forum_topic_for_approve
if forum_topic if forum_topic
forum_topic.posts.create( CurrentUser.scoped(admin, "127.0.0.1") do
:body => "The tag implication #{antecedent_name} -> #{consequent_name} has been approved." forum_topic.posts.create(
) :body => "The tag implication #{antecedent_name} -> #{consequent_name} has been approved."
)
end
end end
end end