Locale maintenance:

[rails.git] / app / controllers / diary_entry_controller.rb

diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index 3e012f23c6a34c306560bb2ae98e453539fc9ca9..68d3a81ee93485e89ce5f37204011aff10ac6a1c 100644 (file)
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -176,19 +176,22 @@ class DiaryEntryController < ApplicationController
 
   def hide
     entry = DiaryEntry.find(params[:id])
-    entry.update_attributes(:visible => false)
+    entry.update_attributes({:visible => false}, :without_protection => true)
     redirect_to :action => "list", :display_name => entry.user.display_name
   end
 
   def hidecomment
     comment = DiaryComment.find(params[:comment])
-    comment.update_attributes(:visible => false)
+    comment.update_attributes({:visible => false}, :without_protection => true)
     redirect_to :action => "view", :display_name => comment.diary_entry.user.display_name, :id => comment.diary_entry.id
   end
 
   def comments
     @comment_pages, @comments = paginate(:diary_comments,
-                                         :conditions => { :user_id => @this_user },
+                                         :conditions => { 
+                                           :user_id => @this_user,
+                                           :visible => true
+                                         },
                                          :order => 'created_at DESC',
                                          :per_page => 20)
     @page = (params[:page] || 1).to_i