fixes #1904: Display aliases/implications in artist excerpt, fixes bug with approving alias/implications involving artists

This commit is contained in:
r888888888
2015-08-06 16:40:30 -07:00
parent 65d52ebb40
commit e675016ec5
6 changed files with 47 additions and 29 deletions

View File

@@ -92,7 +92,7 @@ class ForumPost < ActiveRecord::Base
end
def validate_topic_is_unlocked
return if CurrentUser.user.is_moderator?
return if CurrentUser.is_moderator?
return if topic.nil?
if topic.is_locked?

View File

@@ -86,7 +86,10 @@ class TagAlias < ActiveRecord::Base
clear_all_cache
ensure_category_consistency
update_posts
update_forum_topic_for_approve if update_topic
admin = CurrentUser.user || User.admins.first
CurrentUser.scoped(admin, "127.0.0.1") do
update_forum_topic_for_approve if update_topic
end
update_column(:post_count, consequent_tag.post_count)
update_column(:status, "active")
rescue Exception => e