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

dont scope approver ip addr for tag alias/implication

Browse Source
This commit is contained in:
r888888888
2017-04-12 16:42:43 -07:00
parent 19b8d41d09
commit cbc886e140
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/tag_alias.rb
View File

@@ -141,10 +141,9 @@ class TagAlias < ActiveRecord::Base
end end
tries = 0 tries = 0
messages = []
begin begin
CurrentUser.scoped(approver, CurrentUser.ip_addr) do CurrentUser.scoped(approver) do
update({ :status => "processing" }, :as => CurrentUser.role) update({ :status => "processing" }, :as => CurrentUser.role)
move_aliases_and_implications move_aliases_and_implications
move_saved_searches move_saved_searches
@@ -162,7 +161,7 @@ class TagAlias < ActiveRecord::Base
retry retry
end end
CurrentUser.scoped(approver, CurrentUser.ip_addr) do CurrentUser.scoped(approver) do
forum_updater.update(failure_message(e), "FAILED") if update_topic forum_updater.update(failure_message(e), "FAILED") if update_topic
update({ :status => "error: #{e}" }, :as => CurrentUser.role) update({ :status => "error: #{e}" }, :as => CurrentUser.role)
end end

2
app/models/tag_implication.rb
View File

@@ -185,7 +185,7 @@ class TagImplication < ActiveRecord::Base
tries = 0 tries = 0
begin begin
CurrentUser.scoped(approver, CurrentUser.ip_addr) do CurrentUser.scoped(approver) do
update({ :status => "processing" }, :as => CurrentUser.role) update({ :status => "processing" }, :as => CurrentUser.role)
update_posts update_posts
update({ :status => "active" }, :as => CurrentUser.role) update({ :status => "active" }, :as => CurrentUser.role)