X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b70da7b8ea15ab48bb2f34155567cea6dffc8fc9..17b18fcb816f26953a05742d2101cef99df87d30:/app/controllers/notes_controller.rb diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb index 9f2fdb7e2..440a620e8 100644 --- a/app/controllers/notes_controller.rb +++ b/app/controllers/notes_controller.rb @@ -1,13 +1,14 @@ class NotesController < ApplicationController - layout "site" + layout :map_layout before_action :check_api_readable before_action :authorize_web + before_action :require_oauth authorize_resource before_action :set_locale - around_action :api_call_handle_error, :api_call_timeout + around_action :web_timeout ## # Display a list of notes by a specified user @@ -21,12 +22,30 @@ class NotesController < ApplicationController @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) + + render :layout => "site" else @title = t "users.no_such_user.title" @not_found_user = params[:display_name] - render :template => "users/no_such_user", :status => :not_found + render :template => "users/no_such_user", :status => :not_found, :layout => "site" end end end + + def show + @type = "note" + + if current_user&.moderator? + @note = Note.find(params[:id]) + @note_comments = @note.comments.unscope(:where => :visible) + else + @note = Note.visible.find(params[:id]) + @note_comments = @note.comments + end + rescue ActiveRecord::RecordNotFound + render :template => "browse/not_found", :status => :not_found + end + + def new; end end