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]
@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
# 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 = 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
+ # Choose the sort order
@notes = if params[:sort] == "created_at"
if params[:order] == "oldest"
@notes.order("created_at ASC")
end
end
+ # Find the notes we want to return
@notes = @notes.distinct.limit(result_limit).preload(:comments)
# Render the result
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
##
# 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
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