From 9da5e67a65f29c84344ecf4fac03834ed61d80f7 Mon Sep 17 00:00:00 2001
From: Type-kun <workwork-1@yandex.ru>
Date: Mon, 9 Jan 2017 13:57:16 +0500
Subject: [PATCH] Another partial fix for issue #2824, which also affected ip
 bans and feedback Also fixed minor errors with IP bans

---
 app/controllers/ip_bans_controller.rb | 2 +-
 app/models/comment.rb                 | 4 ++--
 app/models/forum_post.rb              | 4 ++--
 app/models/ip_ban.rb                  | 4 ++--
 app/models/user_feedback.rb           | 8 ++++----
 app/views/ip_bans/index.html.erb      | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/controllers/ip_bans_controller.rb b/app/controllers/ip_bans_controller.rb
index 82e8689b7..0eccf5229 100644
--- a/app/controllers/ip_bans_controller.rb
+++ b/app/controllers/ip_bans_controller.rb
@@ -8,7 +8,7 @@ class IpBansController < ApplicationController
 
   def create
     @ip_ban = IpBan.create(params[:ip_ban])
-    respond_with(@ip_ban)
+    respond_with(@ip_ban, :location => ip_bans_path)
   end
 
   def index
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 473641c7b..c1a620733 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -12,11 +12,11 @@ class Comment < ActiveRecord::Base
   before_validation :initialize_updater
   after_create :update_last_commented_at_on_create
   after_update(:if => lambda {|rec| CurrentUser.id != rec.creator_id}) do
-    ModAction.log("comment ##{self.id} updated by #{CurrentUser.name}")
+    ModAction.log("comment ##{id} updated by #{CurrentUser.name}")
   end
   after_destroy :update_last_commented_at_on_destroy
   after_destroy(:if => lambda {|rec| CurrentUser.id != rec.creator_id}) do
-    ModAction.log("comment ##{self.id} deleted by #{CurrentUser.name}")
+    ModAction.log("comment ##{id} deleted by #{CurrentUser.name}")
   end
   attr_accessible :body, :post_id, :do_not_bump_post, :is_deleted, :as => [:member, :gold, :platinum, :builder, :janitor, :moderator, :admin]
   attr_accessible :is_sticky, :as => [:moderator, :admin]
diff --git a/app/models/forum_post.rb b/app/models/forum_post.rb
index 9773d73f3..ab546c6eb 100644
--- a/app/models/forum_post.rb
+++ b/app/models/forum_post.rb
@@ -20,10 +20,10 @@ class ForumPost < ActiveRecord::Base
   before_destroy :validate_topic_is_unlocked
   after_save :delete_topic_if_original_post
   after_update(:if => lambda {|rec| rec.updater_id != rec.creator_id}) do
-    ModAction.log("#{CurrentUser.name} updated forum post ##{self.id}")
+    ModAction.log("#{CurrentUser.name} updated forum post ##{id}")
   end
   after_destroy(:if => lambda {|rec| rec.updater_id != rec.creator_id}) do
-    ModAction.log("#{CurrentUser.name} deleted forum post ##{self.id}")
+    ModAction.log("#{CurrentUser.name} deleted forum post ##{id}")
   end
   mentionable(
     :message_field => :body, 
diff --git a/app/models/ip_ban.rb b/app/models/ip_ban.rb
index 604809e5e..543102a7d 100644
--- a/app/models/ip_ban.rb
+++ b/app/models/ip_ban.rb
@@ -7,10 +7,10 @@ class IpBan < ActiveRecord::Base
   validates_uniqueness_of :ip_addr, :if => lambda {|rec| rec.ip_addr =~ IP_ADDR_REGEX}
   attr_accessible :ip_addr, :reason
   after_create do
-    ModAction.log("#{CurrentUser.name} created ip ban for #{rec.ip_addr}")
+    ModAction.log("#{CurrentUser.name} created ip ban for #{ip_addr}")
   end
   after_destroy do
-    ModAction.log("#{CurrentUser.name} deleted ip ban for ##{rec.ip_addr}")
+    ModAction.log("#{CurrentUser.name} deleted ip ban for #{ip_addr}")
   end
 
   def self.is_banned?(ip_addr)
diff --git a/app/models/user_feedback.rb b/app/models/user_feedback.rb
index 92b02f1a7..0b80f537f 100644
--- a/app/models/user_feedback.rb
+++ b/app/models/user_feedback.rb
@@ -10,11 +10,11 @@ class UserFeedback < ActiveRecord::Base
   validate :creator_is_gold
   validate :user_is_not_creator
   after_create :create_dmail
-  after_update(:if => lambda {|rec| rec.updater_id != rec.creator_id}) do
-    ModAction.log("#{CurrentUser.name} updated user feedback for #{rec.user_name}")
+  after_update(:if => lambda {|rec| CurrentUser.id != rec.creator_id}) do
+    ModAction.log(%{#{CurrentUser.name} updated user feedback for "#{user_name}":/users/#{user_id}})
   end
-  after_destroy(:if => lambda {|rec| rec.updater_id != rec.creator_id}) do
-    ModAction.log("#{CurrentUser.name} deleted user feedback for #{rec.user_name}")
+  after_destroy(:if => lambda {|rec| CurrentUser.id != rec.creator_id}) do
+    ModAction.log(%{#{CurrentUser.name} deleted user feedback for "#{user_name}":/users/#{user_id}})
   end
 
   module SearchMethods
diff --git a/app/views/ip_bans/index.html.erb b/app/views/ip_bans/index.html.erb
index b52c7d56c..9646a1145 100644
--- a/app/views/ip_bans/index.html.erb
+++ b/app/views/ip_bans/index.html.erb
@@ -17,7 +17,7 @@
             <td><%= ip_ban.ip_addr %></td>
             <td><%= ip_ban.creator.name %></td>
             <td><%= ip_ban.reason %></td>
-            <td><%= link_to "Unban", ip_ban_path(ip_ban), :remote => true, :method => :delete, :data => {:confirm => "Do your really want to unban #{ip_ban.creator.name}?"} %></td>
+            <td><%= link_to "Unban", ip_ban_path(ip_ban), :remote => true, :method => :delete, :data => {:confirm => "Do your really want to unban #{ip_ban.ip_addr}?"} %></td>
           </tr>
         <% end %>
       </tbody>