Merge remote-tracking branch 'upstream/pull/2884'

[rails.git] / app / controllers / api / notes_controller.rb

diff --git a/app/controllers/api/notes_controller.rb b/app/controllers/api/notes_controller.rb
index 23ea4e9553cb1390cde7e3d69ff099b7c2142272..f4d1d0dac957511b16033d1425199c8356cf86e8 100644 (file)
--- a/app/controllers/api/notes_controller.rb
+++ b/app/controllers/api/notes_controller.rb
@@ -1,7 +1,5 @@
 module Api
   class NotesController < ApiController
-    layout "site", :only => [:mine]
-
     before_action :check_api_readable
     before_action :setup_user_auth, :only => [:create, :comment, :show]
     before_action :authorize, :only => [:close, :reopen, :destroy, :comment]
@@ -294,14 +292,30 @@ 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
-      sort_by = params[:sort_by] == "created_at" ? "created_at" : "updated_at"
-      order_by = params[:order_by] == "ASC" ? "ASC" : "DESC"
+      # 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
 
-      @notes = @notes.order("#{sort_by} #{order_by}").limit(result_limit).preload(:comments)
+      # Find the notes we want to return
+      @notes = @notes.distinct.limit(result_limit).preload(:comments)
 
       # Render the result
       respond_to do |format|
@@ -367,7 +381,7 @@ module Api
       comment = note.comments.create!(attributes)
 
       note.comments.map(&:author).uniq.each do |user|
-        Notifier.note_comment_notification(comment, user).deliver_later if notify && user && user != current_user && user.visible?
+        UserMailer.note_comment_notification(comment, user).deliver_later if notify && user && user != current_user && user.visible?
       end
     end
   end