Added sortable headers + search + reportable Notes

[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 ee998ba8a3f7fd85531e43f84b3d7c8af3c3eee5..ed5a640579b713d4f63683ad824f94cb5b3e04f4 100644 (file)
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -152,6 +152,9 @@ class DiaryEntryController < ApplicationController
     @entry = @this_user.diary_entries.visible.where(:id => params[:id]).first
     if @entry
       @title = t "diary_entry.view.title", :user => params[:display_name], :title => @entry.title
+      if params[:comment_id]
+        @reported_comment = DiaryComment.where(id: params[:comment_id])
+      end
     else
       @title = t "diary_entry.no_such_entry.title", :id => params[:id]
       render :action => "no_such_entry", :status => :not_found
@@ -205,12 +208,6 @@ class DiaryEntryController < ApplicationController
     end
   end
 
-  ##
-  # is this list user specific?
-  def user_specific_list?
-    params[:friends] || params[:nearby]
-  end
-
   ##
   # decide on a location for the diary entry map
   def set_map_location