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

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