X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7ccd11ebf3c8e119a04119a2e89ce6a879560578..32104684f7fe70bac494ede1f7249a6cf19a63ec:/app/controllers/api/notes_controller.rb?ds=sidebyside diff --git a/app/controllers/api/notes_controller.rb b/app/controllers/api/notes_controller.rb index 686e76b14..7454e7f19 100644 --- a/app/controllers/api/notes_controller.rb +++ b/app/controllers/api/notes_controller.rb @@ -1,16 +1,12 @@ module Api - class NotesController < ApplicationController - layout "site", :only => [:mine] - - skip_before_action :verify_authenticity_token + class NotesController < ApiController before_action :check_api_readable + before_action :check_api_writable, :only => [:create, :comment, :close, :reopen, :destroy] before_action :setup_user_auth, :only => [:create, :comment, :show] - before_action :authorize, :only => [:close, :reopen, :destroy] - before_action :api_deny_access_handler + 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 @@ -244,7 +240,7 @@ module Api @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 @@ -281,26 +277,45 @@ module Api # 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] - Time.parse(params[:to]) + Time.parse(params[:to]).utc else - Time.now + Time.now.utc end rescue ArgumentError 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 + # 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 - @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| @@ -346,7 +361,7 @@ module Api 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 @@ -354,7 +369,7 @@ module Api ## # 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 @@ -366,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