From d99e9c5d819f9e1af78d746eed1db402155115f1 Mon Sep 17 00:00:00 2001
From: Toks <tttoksss@gmail.com>
Date: Mon, 20 May 2013 08:42:15 -0400
Subject: [PATCH] fixes #1561

---
 app/controllers/pools_controller.rb |  2 ++
 app/models/pool.rb                  | 10 +++++++++-
 app/models/wiki_page.rb             |  5 +++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/controllers/pools_controller.rb b/app/controllers/pools_controller.rb
index 2fbc70ca9..e424bf807 100644
--- a/app/controllers/pools_controller.rb
+++ b/app/controllers/pools_controller.rb
@@ -52,6 +52,7 @@ class PoolsController < ApplicationController
       raise User::PrivilegeError
     end
     @pool.update_attribute(:is_deleted, true)
+    @pool.create_mod_action_for_delete
     respond_with(@pool, :notice => "Pool deleted")
   end
 
@@ -61,6 +62,7 @@ class PoolsController < ApplicationController
       raise User::PrivilegeError
     end
     @pool.update_attribute(:is_deleted, false)
+    @pool.create_mod_action_for_undelete
     respond_with(@pool, :notice => "Pool undeleted")
   end
 
diff --git a/app/models/pool.rb b/app/models/pool.rb
index 35848b615..2fc12ba5d 100644
--- a/app/models/pool.rb
+++ b/app/models/pool.rb
@@ -152,8 +152,16 @@ class Pool < ActiveRecord::Base
     user.is_janitor?
   end
 
+  def create_mod_action_for_delete
+    ModAction.create(:description => "deleted pool ##{id} (name: #{name})")
+  end
+
+  def create_mod_action_for_undelete
+    ModAction.create(:description => "undeleted pool ##{id} (name: #{name})")
+  end
+
   def create_mod_action_for_destroy
-    ModAction.create(:description => "deleted pool ##{id} name=#{name} post_ids=#{post_ids}")
+    ModAction.create(:description => "permanently deleted pool ##{id} name=#{name} post_ids=#{post_ids}")
   end
 
   def add!(post)
diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb
index f2b9a130f..a9df27a6d 100644
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -3,6 +3,7 @@ class WikiPage < ActiveRecord::Base
   before_validation :initialize_creator, :on => :create
   before_validation :initialize_updater
   after_save :create_version
+  before_destroy :create_mod_action_for_destroy
   belongs_to :creator, :class_name => "User"
   belongs_to :updater, :class_name => "User"
   validates_uniqueness_of :title, :case_sensitive => false
@@ -159,4 +160,8 @@ class WikiPage < ActiveRecord::Base
       end
     end.map {|x| x.mb_chars.downcase.tr(" ", "_").to_s}
   end
+
+  def create_mod_action_for_destroy
+    ModAction.create(:description => "permanently deleted wiki page [[#{title}]]")
+  end
 end