Increase the limit when a warning about a large number of objects is displayed.

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

diff --git a/app/controllers/diary_comments_controller.rb b/app/controllers/diary_comments_controller.rb
index 8abf2071b383a4e9842f7b430376b6ce11b47209..91e05ff7413f9cd3d0a5a28308e93aa0ad8d8a3a 100644 (file)
--- a/app/controllers/diary_comments_controller.rb
+++ b/app/controllers/diary_comments_controller.rb
@@ -1,7 +1,4 @@
 class DiaryCommentsController < ApplicationController
 class DiaryCommentsController < ApplicationController

-  include UserMethods
-  include PaginationMethods
-

   layout "site"
 
   before_action :authorize_web
   layout "site"
 
   before_action :authorize_web


@@ -10,20 +7,31 @@ class DiaryCommentsController < ApplicationController
 
   authorize_resource
 
 
   authorize_resource
 

-  before_action :lookup_user, :only => :index
-  before_action :check_database_writable, :only => [:hide, :unhide]
+  before_action :check_database_writable

 
 

-  allow_thirdparty_images :only => :index
+  allow_thirdparty_images :only => :create

 
 

-  def index
-    @title = t ".title", :user => @user.display_name
+  def create
+    @entry = DiaryEntry.find(params[:id])
+    @comments = @entry.visible_comments
+    @diary_comment = @entry.comments.build(comment_params)
+    @diary_comment.user = current_user
+    if @diary_comment.save

 
 

-    comments = DiaryComment.where(:user => @user)
-    comments = comments.visible unless can? :unhide, DiaryComment
+      # Notify current subscribers of the new comment
+      @entry.subscribers.visible.each do |user|
+        UserMailer.diary_comment_notification(@diary_comment, user).deliver_later if current_user != user
+      end

 
 

-    @params = params.permit(:display_name, :before, :after)
+      # Add the commenter to the subscribers if necessary
+      @entry.subscriptions.create(:user => current_user) unless @entry.subscribers.exists?(current_user.id)

 
 

-    @comments, @newer_comments_id, @older_comments_id = get_page_items(comments, :includes => [:user])
+      redirect_to diary_entry_path(@entry.user, @entry, :anchor => "comment#{@diary_comment.id}")
+    else
+      render :action => "new"
+    end
+  rescue ActiveRecord::RecordNotFound
+    render "diary_entries/no_such_entry", :status => :not_found

   end
 
   def hide
   end
 
   def hide


@@ -37,4 +45,12 @@ class DiaryCommentsController < ApplicationController
     comment.update(:visible => true)
     redirect_to diary_entry_path(comment.diary_entry.user, comment.diary_entry)
   end
     comment.update(:visible => true)
     redirect_to diary_entry_path(comment.diary_entry.user, comment.diary_entry)
   end

+
+  private
+
+  ##
+  # return permitted diary comment parameters
+  def comment_params
+    params.require(:diary_comment).permit(:body)
+  end

 end
 end