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

fixes #2590: Approving implication creates forum post under "albert" instead of actual approver

Browse Source
This commit is contained in:
r888888888
2016-04-25 16:48:53 -07:00
parent 641250d2a9
commit 667f912093
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/tag_aliases_controller.rb
View File

@@ -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

2
app/controllers/tag_implications_controller.rb
View File

@@ -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

4
app/logical/alias_and_implication_importer.rb
View File

@@ -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

4
app/models/tag_alias.rb
View File

@@ -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

4
app/models/tag_implication.rb
View File

@@ -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