Sort and order notes by different values and ascending or descending order

diff --git a/app/controllers/api/notes_controller.rb b/app/controllers/api/notes_controller.rb
index fc9167eb382e8864aa2929ef4a69083eca7f010b..23ea4e9553cb1390cde7e3d69ff099b7c2142272 100644 (file)
--- a/app/controllers/api/notes_controller.rb
+++ b/app/controllers/api/notes_controller.rb
@@ -294,11 +294,14 @@ module Api
           raise OSM::APIBadUserInput, "Date #{params[:to]} is in a wrong format"
         end
 
-        @notes = @notes.where(:created_at => from..to)
+        @notes = params[:sort] == "created_at" ? @notes.where(:created_at => from..to) : @notes.where(:updated_at => from..to)
       end
 
       # Find the notes we want to return
-      @notes = @notes.order("updated_at DESC").limit(result_limit).preload(:comments)
+      sort_by = params[:sort_by] == "created_at" ? "created_at" : "updated_at"
+      order_by = params[:order_by] == "ASC" ? "ASC" : "DESC"
+
+      @notes = @notes.order("#{sort_by} #{order_by}").limit(result_limit).preload(:comments)
 
       # Render the result
       respond_to do |format|