layout 'site', :only => [:mine]
before_filter :check_api_readable
- before_filter :authorize_web, :only => [:create, :comment, :close, :destroy, :mine]
- before_filter :check_api_writable, :only => [:create, :comment, :close, :destroy]
- before_filter :set_locale, :only => [:mine]
+ before_filter :authorize_web, :only => [:mine]
+ before_filter :setup_user_auth, :only => [:create, :comment]
+ before_filter :authorize, :only => [:close, :reopen, :destroy]
+ before_filter :require_moderator, :only => [:destroy]
+ before_filter :check_api_writable, :only => [:create, :comment, :close, :reopen, :destroy]
+ before_filter :require_allow_write_notes, :only => [:create, :comment, :close, :reopen, :destroy]
+ before_filter :set_locale
after_filter :compress_output
around_filter :api_call_handle_error, :api_call_timeout
end
# Get any conditions that need to be applied
- notes = closed_condition(Note.scoped)
+ notes = closed_condition(Note.all)
# Check that the boundaries are valid
bbox.check_boundaries
# Check the arguments are sane
raise OSM::APIBadUserInput.new("No lat was given") unless params[:lat]
raise OSM::APIBadUserInput.new("No lon was given") unless params[:lon]
- raise OSM::APIBadUserInput.new("No text was given") unless params[:text]
+ raise OSM::APIBadUserInput.new("No text was given") if params[:text].blank?
# Extract the arguments
- lon = params[:lon].to_f
- lat = params[:lat].to_f
+ lon = OSM.parse_float(params[:lon], OSM::APIBadUserInput, "lon was not a number")
+ lat = OSM.parse_float(params[:lat], OSM::APIBadUserInput, "lat was not a number")
comment = params[:text]
- name = params[:name]
# Include in a transaction to ensure that there is always a note_comment for every note
Note.transaction do
@note.save!
# Add a comment to the note
- add_comment(@note, comment, name, "opened")
+ add_comment(@note, comment, "opened")
end
# Return a copy of the new note
def comment
# Check the arguments are sane
raise OSM::APIBadUserInput.new("No id was given") unless params[:id]
- raise OSM::APIBadUserInput.new("No text was given") unless params[:text]
+ raise OSM::APIBadUserInput.new("No text was given") if params[:text].blank?
# Extract the arguments
id = params[:id].to_i
comment = params[:text]
- name = params[:name] or "NoName"
# Find the note and check it is valid
@note = Note.find(id)
raise OSM::APINotFoundError unless @note
- raise OSM::APIAlreadyDeletedError unless @note.visible?
+ raise OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible?
+ raise OSM::APINoteAlreadyClosedError.new(@note) if @note.closed?
# Add a comment to the note
Note.transaction do
- add_comment(@note, comment, name, "commented")
+ add_comment(@note, comment, "commented")
end
# Return a copy of the updated note
# Extract the arguments
id = params[:id].to_i
comment = params[:text]
- name = params[:name]
# Find the note and check it is valid
@note = Note.find_by_id(id)
raise OSM::APINotFoundError unless @note
- raise OSM::APIAlreadyDeletedError unless @note.visible?
+ raise OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible?
+ raise OSM::APINoteAlreadyClosedError.new(@note) if @note.closed?
# Close the note and add a comment
Note.transaction do
@note.close
- add_comment(@note, comment, name, "closed")
+ add_comment(@note, comment, "closed")
+ end
+
+ # Return a copy of the updated note
+ respond_to do |format|
+ format.xml { render :action => :show }
+ format.json { render :action => :show }
+ end
+ end
+
+ ##
+ # Reopen a note
+ def reopen
+ # Check the arguments are sane
+ raise OSM::APIBadUserInput.new("No id was given") unless params[:id]
+
+ # Extract the arguments
+ id = params[:id].to_i
+ comment = params[:text]
+
+ # Find the note and check it is valid
+ @note = Note.find_by_id(id)
+ raise OSM::APINotFoundError unless @note
+ raise OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible?
+ raise OSM::APINoteAlreadyOpenError.new(@note) unless @note.closed?
+
+ # Reopen the note and add a comment
+ Note.transaction do
+ @note.reopen
+
+ add_comment(@note, comment, "reopened")
end
# Return a copy of the updated note
# Get a feed of recent notes and comments
def feed
# Get any conditions that need to be applied
- notes = closed_condition(Note.scoped)
+ notes = closed_condition(Note.all)
# Process any bbox
if params[:bbox]
# Find the note and check it is valid
@note = Note.find(params[:id])
raise OSM::APINotFoundError unless @note
- raise OSM::APIAlreadyDeletedError unless @note.visible?
-
+ raise OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible?
+
# Render the result
respond_to do |format|
format.xml
# Extract the arguments
id = params[:id].to_i
- name = params[:name]
+ comment = params[:text]
# Find the note and check it is valid
- note = Note.find(id)
- raise OSM::APINotFoundError unless note
- raise OSM::APIAlreadyDeletedError unless note.visible?
+ @note = Note.find(id)
+ raise OSM::APINotFoundError unless @note
+ raise OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible?
# Mark the note as hidden
Note.transaction do
- note.status = "hidden"
- note.save
+ @note.status = "hidden"
+ @note.save
- add_comment(note, nil, name, "hidden")
+ add_comment(@note, comment, "hidden", false)
end
- # Render the result
- render :text => "ok\n", :content_type => "text/html"
+ # Return a copy of the updated note
+ respond_to do |format|
+ format.xml { render :action => :show }
+ format.json { render :action => :show }
+ end
end
##
raise OSM::APIBadUserInput.new("No query string was given") unless params[:q]
# Get any conditions that need to be applied
- @notes = closed_condition(Note.scoped)
+ @notes = closed_condition(Note.all)
@notes = @notes.joins(:comments).where("note_comments.body ~ ?", params[:q])
# Find the notes we want to return
if @this_user = User.active.find_by_display_name(params[:display_name])
@title = t 'note.mine.title', :user => @this_user.display_name
@heading = t 'note.mine.heading', :user => @this_user.display_name
- @description = t 'note.mine.description', :user => render_to_string(:partial => "user", :object => @this_user)
+ @description = t 'note.mine.subheading', :user => render_to_string(:partial => "user", :object => @this_user)
@page = (params[:page] || 1).to_i
@page_size = 10
- @notes = @this_user.notes.order("updated_at DESC").offset((@page - 1) * @page_size).limit(@page_size).preload(:comments => :author)
+ @notes = @this_user.notes.order("updated_at DESC, id").uniq.offset((@page - 1) * @page_size).limit(@page_size).preload(:comments => :author).to_a
else
@title = t 'user.no_such_user.title'
@not_found_user = params[:display_name]
##
# Add a comment to a note
- def add_comment(note, text, name, event)
- name = "NoName" if name.nil?
-
+ def add_comment(note, text, event, notify = true)
attributes = { :visible => true, :event => event, :body => text }
if @user
attributes[:author_id] = @user.id
- attributes[:author_name] = @user.display_name
else
attributes[:author_ip] = request.remote_ip
- attributes[:author_name] = name + " (a)"
end
- comment = note.comments.create(attributes, :without_protection => true)
+ comment = note.comments.create(attributes)
note.comments.map { |c| c.author }.uniq.each do |user|
- if user and user != @user
+ if notify and user and user != @user
Notifier.note_comment_notification(comment, user).deliver
end
end
projects / rails.git / blobdiff