Merge branch 'pull/5530'

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

diff --git a/app/controllers/users/diary_comments_controller.rb b/app/controllers/users/diary_comments_controller.rb
index 5e6a552027376201866cbac59e28f43de8d94b54..4737ec0071db66ebb81b5cb0f55d46e34dd267bd 100644 (file)
--- a/app/controllers/users/diary_comments_controller.rb
+++ b/app/controllers/users/diary_comments_controller.rb
@@ -1,20 +1,5 @@
 module Users
-  class DiaryCommentsController < ApplicationController
-    include UserMethods
-    include PaginationMethods
-
-    layout "site"
-
-    before_action :authorize_web
-    before_action :set_locale
-    before_action :check_database_readable
-
-    authorize_resource
-
-    before_action :lookup_user
-
-    allow_thirdparty_images
-
+  class DiaryCommentsController < CommentsController
     def index
       @title = t ".title", :user => @user.display_name
 
@@ -23,7 +8,7 @@ module Users
 
       @params = params.permit(:display_name, :before, :after)
 
-      @comments, @newer_comments_id, @older_comments_id = get_page_items(comments, :includes => [:user])
+      @comments, @newer_comments_id, @older_comments_id = get_page_items(comments, :includes => [:user, :diary_entry])
 
       render :partial => "page" if turbo_frame_request_id == "pagination"
     end