X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b5046fdcd02b7ae9c10f22fa0b483e6eb2e06fa3..045af66d438a7fa3567cb4a10ea2f6a255e742c8:/app/controllers/notes_controller.rb?ds=sidebyside diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb index 4c1bac193..c47a3abfb 100644 --- a/app/controllers/notes_controller.rb +++ b/app/controllers/notes_controller.rb @@ -1,4 +1,6 @@ class NotesController < ApplicationController + include UserMethods + layout :map_layout before_action :check_api_readable @@ -7,30 +9,39 @@ class NotesController < ApplicationController authorize_resource + before_action :lookup_user, :only => [:index] before_action :set_locale around_action :web_timeout ## # Display a list of notes by a specified user def index - if params[:display_name] - if @user = User.active.find_by(:display_name => params[:display_name]) - @params = params.permit(:display_name) - @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) - - 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, :layout => "site" - end + param! :page, Integer, :min => 1 + + @params = params.permit(:display_name, :status) + @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.where(:status => params[:status]) unless params[:status] == "all" || params[:status].blank? + @notes = @notes.order("updated_at DESC, id").distinct.offset((@page - 1) * @page_size).limit(@page_size).preload(:comments => :author) + + render :layout => "site" + 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