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

[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 cd71b437457e302f2e33c13d6faf90f9761c5e6f..d915d8126e42c268357a10b0f1a88ff4d6ba0de4 100644 (file)
--- a/app/controllers/api/notes_controller.rb
+++ b/app/controllers/api/notes_controller.rb
@@ -1,14 +1,15 @@
 module Api
   class NotesController < ApiController
     before_action :check_api_readable
 module Api
   class NotesController < ApiController
     before_action :check_api_readable

-    before_action :setup_user_auth, :only => [:create, :comment, :show]
+    before_action :check_api_writable, :only => [:create, :comment, :close, :reopen, :destroy]
+    before_action :setup_user_auth, :only => [:create, :show]

     before_action :authorize, :only => [:close, :reopen, :destroy, :comment]
 
     authorize_resource
 
     before_action :authorize, :only => [:close, :reopen, :destroy, :comment]
 
     authorize_resource
 

-    before_action :check_api_writable, :only => [:create, :comment, :close, :reopen, :destroy]

     before_action :set_locale
     around_action :api_call_handle_error, :api_call_timeout
     before_action :set_locale
     around_action :api_call_handle_error, :api_call_timeout

+    before_action :set_request_formats, :except => [:feed]

 
     ##
     # Return a list of notes in a given area
 
     ##
     # Return a list of notes in a given area


@@ -34,6 +35,10 @@ module Api
 
       # Check the the bounding box is not too big
       bbox.check_size(Settings.max_note_request_area)
 
       # Check the the bounding box is not too big
       bbox.check_size(Settings.max_note_request_area)

+      @min_lon = bbox.min_lon
+      @min_lat = bbox.min_lat
+      @max_lon = bbox.max_lon
+      @max_lat = bbox.max_lat

 
       # Find the notes we want to return
       @notes = notes.bbox(bbox).order("updated_at DESC").limit(result_limit).preload(:comments)
 
       # Find the notes we want to return
       @notes = notes.bbox(bbox).order("updated_at DESC").limit(result_limit).preload(:comments)


@@ -189,6 +194,10 @@ module Api
         bbox.check_size(Settings.max_note_request_area)
 
         notes = notes.bbox(bbox)
         bbox.check_size(Settings.max_note_request_area)
 
         notes = notes.bbox(bbox)

+        @min_lon = bbox.min_lon
+        @min_lat = bbox.min_lat
+        @max_lon = bbox.max_lon
+        @max_lat = bbox.max_lat

       end
 
       # Find the comments we want to return
       end
 
       # Find the comments we want to return


@@ -240,7 +249,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


@@ -277,16 +286,16 @@ module Api
       # Add any date filter
       if params[:from]
         begin
       # Add any date filter
       if params[:from]
         begin

-          from = Time.parse(params[:from])
+          from = Time.parse(params[:from]).utc

         rescue ArgumentError
           raise OSM::APIBadUserInput, "Date #{params[:from]} is in a wrong format"
         end
 
         begin
           to = if params[:to]
         rescue ArgumentError
           raise OSM::APIBadUserInput, "Date #{params[:from]} is in a wrong format"
         end
 
         begin
           to = if params[:to]

-                 Time.parse(params[:to])
+                 Time.parse(params[:to]).utc

                else
                else

-                 Time.now
+                 Time.now.utc

                end
         rescue ArgumentError
           raise OSM::APIBadUserInput, "Date #{params[:to]} is in a wrong format"
                end
         rescue ArgumentError
           raise OSM::APIBadUserInput, "Date #{params[:to]} is in a wrong format"


@@ -361,7 +370,7 @@ module Api
       elsif closed_since.positive?
         notes.where(:status => "open")
              .or(notes.where(:status => "closed")
       elsif closed_since.positive?
         notes.where(:status => "open")
              .or(notes.where(:status => "closed")

-                      .where(notes.arel_table[:closed_at].gt(Time.now - closed_since.days)))
+                      .where(notes.arel_table[:closed_at].gt(Time.now.utc - closed_since.days)))

       else
         notes.where(:status => "open")
       end
       else
         notes.where(:status => "open")
       end


@@ -369,7 +378,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


@@ -381,7 +390,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