X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/124909a64c4c2b739cebfff69fcf100e6b6d2457..3510dfc5df4e318111f25e69f84614606cec4ad1:/app/controllers/notes_controller.rb diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb index 97efc3eda..c40e776b4 100644 --- a/app/controllers/notes_controller.rb +++ b/app/controllers/notes_controller.rb @@ -16,12 +16,15 @@ class NotesController < ApplicationController ## # Display a list of notes by a specified user def index - @params = params.permit(:display_name) + 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" @@ -41,5 +44,7 @@ class NotesController < ApplicationController render :template => "browse/not_found", :status => :not_found end - def new; end + def new + render :action => :new_readonly if api_status != "online" + end end