From cbc886e140ee09ba309e5e8f4d4d24fcc4227436 Mon Sep 17 00:00:00 2001 From: r888888888 Date: Wed, 12 Apr 2017 16:42:43 -0700 Subject: [PATCH] dont scope approver ip addr for tag alias/implication --- app/models/tag_alias.rb | 5 ++--- app/models/tag_implication.rb | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/models/tag_alias.rb b/app/models/tag_alias.rb index 82d6aa4a8..e8f377735 100644 --- a/app/models/tag_alias.rb +++ b/app/models/tag_alias.rb @@ -141,10 +141,9 @@ class TagAlias < ActiveRecord::Base end tries = 0 - messages = [] begin - CurrentUser.scoped(approver, CurrentUser.ip_addr) do + CurrentUser.scoped(approver) do update({ :status => "processing" }, :as => CurrentUser.role) move_aliases_and_implications move_saved_searches @@ -162,7 +161,7 @@ class TagAlias < ActiveRecord::Base retry end - CurrentUser.scoped(approver, CurrentUser.ip_addr) do + CurrentUser.scoped(approver) do forum_updater.update(failure_message(e), "FAILED") if update_topic update({ :status => "error: #{e}" }, :as => CurrentUser.role) end diff --git a/app/models/tag_implication.rb b/app/models/tag_implication.rb index 44dc9c634..38338bb91 100644 --- a/app/models/tag_implication.rb +++ b/app/models/tag_implication.rb @@ -185,7 +185,7 @@ class TagImplication < ActiveRecord::Base tries = 0 begin - CurrentUser.scoped(approver, CurrentUser.ip_addr) do + CurrentUser.scoped(approver) do update({ :status => "processing" }, :as => CurrentUser.role) update_posts update({ :status => "active" }, :as => CurrentUser.role)