X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/67be6616b0e69fcc275c44b9e8351ddab6e3ce4e..5944feb008005f67a09240d4b9ad1e2513f7633b:/app/controllers/diary_entries_controller.rb?ds=sidebyside diff --git a/app/controllers/diary_entries_controller.rb b/app/controllers/diary_entries_controller.rb index f3fbcd1fd..d1b44acd0 100644 --- a/app/controllers/diary_entries_controller.rb +++ b/app/controllers/diary_entries_controller.rb @@ -10,10 +10,10 @@ class DiaryEntriesController < ApplicationController authorize_resource - before_action :lookup_user, :only => [:show, :comments] + before_action :lookup_user, :only => :show before_action :check_database_writable, :only => [:new, :create, :edit, :update, :comment, :hide, :hidecomment, :subscribe, :unsubscribe] - allow_thirdparty_images :only => [:new, :create, :edit, :update, :index, :show, :comments] + allow_thirdparty_images :only => [:new, :create, :edit, :update, :index, :show] def index if params[:display_name] @@ -241,17 +241,6 @@ class DiaryEntriesController < ApplicationController redirect_to diary_entry_path(comment.diary_entry.user, comment.diary_entry) end - def comments - @title = t ".title", :user => @user.display_name - - comments = DiaryComment.where(:user => @user) - comments = comments.visible unless can? :unhidecomment, DiaryEntry - - @params = params.permit(:display_name, :before, :after) - - @comments, @newer_comments_id, @older_comments_id = get_page_items(comments, :includes => [:user]) - end - private ##