Merge remote-tracking branch 'upstream/pull/5137'

[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 a9a7a2641b902bcef70038d186b59eab5b1846d3..f6597cf4c0fac1f74fa69a2c12b9851fdc6ab4ad 100644 (file)
--- a/app/controllers/diary_comments_controller.rb
+++ b/app/controllers/diary_comments_controller.rb
@@ -24,6 +24,8 @@ class DiaryCommentsController < ApplicationController
     @params = params.permit(:display_name, :before, :after)
 
     @comments, @newer_comments_id, @older_comments_id = get_page_items(comments, :includes => [:user])
     @params = params.permit(:display_name, :before, :after)
 
     @comments, @newer_comments_id, @older_comments_id = get_page_items(comments, :includes => [:user])

+
+    render :partial => "page" if turbo_frame_request_id == "pagination"

   end
 
   def create
   end
 
   def create


@@ -41,7 +43,7 @@ class DiaryCommentsController < ApplicationController
       # Add the commenter to the subscribers if necessary
       @entry.subscriptions.create(:user => current_user) unless @entry.subscribers.exists?(current_user.id)
 
       # Add the commenter to the subscribers if necessary
       @entry.subscriptions.create(:user => current_user) unless @entry.subscribers.exists?(current_user.id)
 

-      redirect_to diary_entry_path(@entry.user, @entry)
+      redirect_to diary_entry_path(@entry.user, @entry, :anchor => "comment#{@diary_comment.id}")

     else
       render :action => "new"
     end
     else
       render :action => "new"
     end