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

[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 fc9167eb382e8864aa2929ef4a69083eca7f010b..f480b9706102c9a549bc770b5c7064b6fdaa7253 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
 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]
     before_action :check_api_readable
     before_action :setup_user_auth, :only => [:create, :comment, :show]
     before_action :authorize, :only => [:close, :reopen, :destroy, :comment]


@@ -242,7 +240,7 @@ module Api
         @note.status = "hidden"
         @note.save
 
         @note.status = "hidden"
         @note.save
 

-        add_comment(@note, comment, "hidden", false)
+        add_comment(@note, comment, "hidden", :notify => false)

       end
 
       # Return a copy of the updated note
       end
 
       # Return a copy of the updated note


@@ -294,11 +292,30 @@ module Api
           raise OSM::APIBadUserInput, "Date #{params[:to]} is in a wrong format"
         end
 
           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
 
       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
       # 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|
 
       # Render the result
       respond_to do |format|


@@ -352,7 +369,7 @@ module Api
 
     ##
     # Add a comment to a note
 
     ##
     # Add a comment to a note

-    def add_comment(note, text, event, notify = true)
+    def add_comment(note, text, event, notify: true)

       attributes = { :visible => true, :event => event, :body => text }
 
       if current_user
       attributes = { :visible => true, :event => event, :body => text }
 
       if current_user


@@ -364,7 +381,7 @@ module Api
       comment = note.comments.create!(attributes)
 
       note.comments.map(&:author).uniq.each do |user|
       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
       end
     end
   end