diff --git a/app/controllers/tag_aliases_controller.rb b/app/controllers/tag_aliases_controller.rb index dafa8a0d3..248d22da6 100644 --- a/app/controllers/tag_aliases_controller.rb +++ b/app/controllers/tag_aliases_controller.rb @@ -45,7 +45,7 @@ class TagAliasesController < ApplicationController @tag_alias = TagAlias.find(params[:id]) @tag_alias.update_column(:status, "queued") @tag_alias.rename_wiki_and_artist - @tag_alias.delay(:queue => "default").process! + @tag_alias.delay(:queue => "default").process!(true, CurrentUser.id) respond_with(@tag_alias, :location => tag_alias_path(@tag_alias)) end end diff --git a/app/controllers/tag_implications_controller.rb b/app/controllers/tag_implications_controller.rb index 5518e1b75..e8c2e4dac 100644 --- a/app/controllers/tag_implications_controller.rb +++ b/app/controllers/tag_implications_controller.rb @@ -49,7 +49,7 @@ class TagImplicationsController < ApplicationController def approve @tag_implication = TagImplication.find(params[:id]) @tag_implication.update_column(:status, "queued") - @tag_implication.delay(:queue => "default").process! + @tag_implication.delay(:queue => "default").process!(true, CurrentUser.id) respond_with(@tag_implication, :location => tag_implication_path(@tag_implication)) end end diff --git a/app/logical/alias_and_implication_importer.rb b/app/logical/alias_and_implication_importer.rb index 9b4b26022..4a769fba2 100644 --- a/app/logical/alias_and_implication_importer.rb +++ b/app/logical/alias_and_implication_importer.rb @@ -87,14 +87,14 @@ private raise "Error: #{tag_alias.errors.full_messages.join("; ")} (create alias #{tag_alias.antecedent_name} -> #{tag_alias.consequent_name})" end tag_alias.rename_wiki_and_artist if rename_aliased_pages? - tag_alias.delay(:queue => "default").process!(false) + tag_alias.delay(:queue => "default").process!(false, CurrentUser.id) when :create_implication tag_implication = TagImplication.create(:forum_topic_id => forum_id, :status => "pending", :antecedent_name => token[1], :consequent_name => token[2], :skip_secondary_validations => skip_secondary_validations) unless tag_implication.valid? raise "Error: #{tag_implication.errors.full_messages.join("; ")} (create implication #{tag_implication.antecedent_name} -> #{tag_implication.consequent_name})" end - tag_implication.delay(:queue => "default").process!(false) + tag_implication.delay(:queue => "default").process!(false, CurrentUser.id) when :remove_alias tag_alias = TagAlias.where("antecedent_name = ?", token[1]).first diff --git a/app/models/tag_alias.rb b/app/models/tag_alias.rb index 8c7fc7df8..2bfe76cb5 100644 --- a/app/models/tag_alias.rb +++ b/app/models/tag_alias.rb @@ -81,7 +81,7 @@ class TagAlias < ActiveRecord::Base end.uniq end - def process!(update_topic=true) + def process!(update_topic=true, approver_id = nil) unless valid? raise errors.full_messages.join("; ") end @@ -89,7 +89,7 @@ class TagAlias < ActiveRecord::Base tries = 0 begin - admin = CurrentUser.user || User.admins.first + admin = CurrentUser.user || User.where(id: approver_id).first || User.admins.first CurrentUser.scoped(admin, "127.0.0.1") do update_column(:status, "processing") move_aliases_and_implications diff --git a/app/models/tag_implication.rb b/app/models/tag_implication.rb index 65f66cadf..b185c4582 100644 --- a/app/models/tag_implication.rb +++ b/app/models/tag_implication.rb @@ -123,7 +123,7 @@ class TagImplication < ActiveRecord::Base self.creator_ip_addr = CurrentUser.ip_addr end - def process!(update_topic=true) + def process!(update_topic=true, approver_id=nil) unless valid? raise errors.full_messages.join("; ") end @@ -131,7 +131,7 @@ class TagImplication < ActiveRecord::Base tries = 0 begin - admin = CurrentUser.user || User.admins.first + admin = CurrentUser.user || User.where(id: approver_id).first || User.admins.first CurrentUser.scoped(admin, "127.0.0.1") do update_column(:status, "processing") update_posts