X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/addf99f1911ec617ba258e075a53d774dee2a672..fee3a0836842d32fbeeb8b7e96c5ec77eb356d20:/app/controllers/diary_entries_controller.rb diff --git a/app/controllers/diary_entries_controller.rb b/app/controllers/diary_entries_controller.rb index ff6686448..9af36709e 100644 --- a/app/controllers/diary_entries_controller.rb +++ b/app/controllers/diary_entries_controller.rb @@ -12,7 +12,8 @@ class DiaryEntriesController < ApplicationController before_action :lookup_user, :only => [:show, :comments] before_action :check_database_writable, :only => [:new, :create, :edit, :update, :comment, :hide, :hidecomment, :subscribe, :unsubscribe] - before_action :allow_thirdparty_images, :only => [:new, :create, :edit, :update, :index, :show, :comments] + + allow_thirdparty_images :only => [:new, :create, :edit, :update, :index, :show, :comments] def index if params[:display_name] @@ -58,7 +59,7 @@ class DiaryEntriesController < ApplicationController @params = params.permit(:display_name, :friends, :nearby, :language) - @entries, @newer_entries_id, @older_entries_id = get_page_items(entries, [:user, :language]) + @entries, @newer_entries_id, @older_entries_id = get_page_items(entries, :includes => [:user, :language]) end def show @@ -247,7 +248,7 @@ class DiaryEntriesController < ApplicationController @params = params.permit(:display_name, :before, :after) - @comments, @newer_comments_id, @older_comments_id = get_page_items(comments, [:user]) + @comments, @newer_comments_id, @older_comments_id = get_page_items(comments, :includes => [:user]) end private