From: ENT8R Date: Wed, 19 Feb 2020 11:58:47 +0000 (+0100) Subject: Keep the behaviour backwards-compatible X-Git-Tag: live~2827^2 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/b84799f481e67c7a5cf6964e228c7a617b1defc7 Keep the behaviour backwards-compatible --- diff --git a/app/controllers/api/notes_controller.rb b/app/controllers/api/notes_controller.rb index 703f275aa..a73240e5f 100644 --- a/app/controllers/api/notes_controller.rb +++ b/app/controllers/api/notes_controller.rb @@ -294,10 +294,14 @@ module Api raise OSM::APIBadUserInput, "Date #{params[:to]} is in a wrong format" end - @notes = params[:sort] == "created_at" ? @notes.where(:created_at => from..to) : @notes.where(:updated_at => from..to) + @notes = if params[:sort] == "updated_at" + @notes.where(:updated_at => from..to) + else + @notes.where(:created_at => from..to) + end end - # Find the notes we want to return + # Choose the sort order @notes = if params[:sort] == "created_at" if params[:order] == "oldest" @notes.order("created_at ASC") @@ -312,6 +316,7 @@ module Api end end + # Find the notes we want to return @notes = @notes.distinct.limit(result_limit).preload(:comments) # Render the result