X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/be0e33862fedbf02e52a9e126cac31dfb5775b43..ec34d220397567b89c984c477726d74d085663e5:/app/controllers/notes_controller.rb diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb index 54fdb2810..9f2fdb7e2 100644 --- a/app/controllers/notes_controller.rb +++ b/app/controllers/notes_controller.rb @@ -1,5 +1,5 @@ class NotesController < ApplicationController - layout "site", :only => [:mine] + layout "site" before_action :check_api_readable before_action :authorize_web @@ -11,18 +11,16 @@ class NotesController < ApplicationController ## # Display a list of notes by a specified user - def mine + def index if params[:display_name] if @user = User.active.find_by(:display_name => params[:display_name]) @params = params.permit(:display_name) - @title = t "notes.mine.title", :user => @user.display_name - @heading = t "notes.mine.heading", :user => @user.display_name - @description = t "notes.mine.subheading", :user => render_to_string(:partial => "user", :object => @user) + @title = t ".title", :user => @user.display_name @page = (params[:page] || 1).to_i @page_size = 10 @notes = @user.notes @notes = @notes.visible unless current_user&.moderator? - @notes = @notes.order("updated_at DESC, id").distinct.offset((@page - 1) * @page_size).limit(@page_size).preload(:comments => :author).to_a + @notes = @notes.order("updated_at DESC, id").distinct.offset((@page - 1) * @page_size).limit(@page_size).preload(:comments => :author) else @title = t "users.no_such_user.title" @not_found_user = params[:display_name]