X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/00c2589374f9b9ed93de707322dbefbd3cd6c634..8f7f02b025f59db466fdb22ea3686cb6c5adc400:/app/controllers/diary_comments_controller.rb?ds=sidebyside diff --git a/app/controllers/diary_comments_controller.rb b/app/controllers/diary_comments_controller.rb index a9a7a2641..91e05ff74 100644 --- a/app/controllers/diary_comments_controller.rb +++ b/app/controllers/diary_comments_controller.rb @@ -1,7 +1,4 @@ class DiaryCommentsController < ApplicationController - include UserMethods - include PaginationMethods - layout "site" before_action :authorize_web @@ -10,21 +7,9 @@ class DiaryCommentsController < ApplicationController authorize_resource - before_action :lookup_user, :only => :index - before_action :check_database_writable, :only => [:create, :hide, :unhide] - - allow_thirdparty_images :only => :index - - def index - @title = t ".title", :user => @user.display_name + before_action :check_database_writable - comments = DiaryComment.where(:user => @user) - comments = comments.visible unless can? :unhide, DiaryComment - - @params = params.permit(:display_name, :before, :after) - - @comments, @newer_comments_id, @older_comments_id = get_page_items(comments, :includes => [:user]) - end + allow_thirdparty_images :only => :create def create @entry = DiaryEntry.find(params[:id]) @@ -41,7 +26,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) - 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