X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/37f8f8a28caea936b53271c9f9de36cdbaf15d0e..bf9dd8f350ca1b54afb79dda79506d980ccb5738:/app/controllers/api/notes_controller.rb diff --git a/app/controllers/api/notes_controller.rb b/app/controllers/api/notes_controller.rb index 20a24ce99..a73240e5f 100644 --- a/app/controllers/api/notes_controller.rb +++ b/app/controllers/api/notes_controller.rb @@ -4,7 +4,7 @@ module Api before_action :check_api_readable before_action :setup_user_auth, :only => [:create, :comment, :show] - before_action :authorize, :only => [:close, :reopen, :destroy] + before_action :authorize, :only => [:close, :reopen, :destroy, :comment] authorize_resource @@ -294,11 +294,30 @@ module Api raise OSM::APIBadUserInput, "Date #{params[:to]} is in a wrong format" end - @notes = @notes.where(:created_at => from..to) + @notes = if params[:sort] == "updated_at" + @notes.where(:updated_at => from..to) + else + @notes.where(:created_at => from..to) + end end + # Choose the sort order + @notes = if params[:sort] == "created_at" + if params[:order] == "oldest" + @notes.order("created_at ASC") + else + @notes.order("created_at DESC") + end + else + if params[:order] == "oldest" + @notes.order("updated_at ASC") + else + @notes.order("updated_at DESC") + end + end + # Find the notes we want to return - @notes = @notes.order("updated_at DESC").limit(result_limit).preload(:comments) + @notes = @notes.distinct.limit(result_limit).preload(:comments) # Render the result respond_to do |format|