X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/21d2fa4f36bb45a935cdba9205ed315243f5862d..043d29fd7eb72048cf5d07edfbc20ec5c25af708:/app/controllers/notes_controller.rb?ds=inline diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb index 1b28cae6e..fde27e8b2 100644 --- a/app/controllers/notes_controller.rb +++ b/app/controllers/notes_controller.rb @@ -1,17 +1,15 @@ class NotesController < ApplicationController - - layout 'site', :only => [:mine] - - before_filter :check_api_readable - 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 + layout "site", :only => [:mine] + + before_action :check_api_readable + before_action :authorize_web, :only => [:mine] + before_action :setup_user_auth, :only => [:create, :comment] + before_action :authorize, :only => [:close, :reopen, :destroy] + before_action :require_moderator, :only => [:destroy] + before_action :check_api_writable, :only => [:create, :comment, :close, :reopen, :destroy] + before_action :require_allow_write_notes, :only => [:create, :comment, :close, :reopen, :destroy] + before_action :set_locale + around_action :api_call_handle_error, :api_call_timeout ## # Return a list of notes in a given area @@ -30,7 +28,7 @@ class NotesController < ApplicationController 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 @@ -53,14 +51,17 @@ class NotesController < ApplicationController ## # Create a new note def create + # Check the ACLs + raise OSM::APIAccessDenied if Acl.no_note_comment(request.remote_ip) + # 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") 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] # Include in a transaction to ensure that there is always a note_comment for every note @@ -86,6 +87,9 @@ class NotesController < ApplicationController ## # Add a comment to an existing note def comment + # Check the ACLs + raise OSM::APIAccessDenied if Acl.no_note_comment(request.remote_ip) + # Check the arguments are sane raise OSM::APIBadUserInput.new("No id was given") unless params[:id] raise OSM::APIBadUserInput.new("No text was given") if params[:text].blank? @@ -123,7 +127,7 @@ class NotesController < ApplicationController comment = params[:text] # Find the note and check it is valid - @note = Note.find_by_id(id) + @note = Note.find_by(:id => id) raise OSM::APINotFoundError unless @note raise OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible? raise OSM::APINoteAlreadyClosedError.new(@note) if @note.closed? @@ -140,7 +144,7 @@ class NotesController < ApplicationController format.xml { render :action => :show } format.json { render :action => :show } end - end + end ## # Reopen a note @@ -153,10 +157,10 @@ class NotesController < ApplicationController comment = params[:text] # Find the note and check it is valid - @note = Note.find_by_id(id) + @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? + raise OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible? || @user.moderator? + raise OSM::APINoteAlreadyOpenError.new(@note) unless @note.closed? || !@note.visible? # Reopen the note and add a comment Note.transaction do @@ -170,13 +174,13 @@ class NotesController < ApplicationController format.xml { render :action => :show } format.json { render :action => :show } end - end + end ## # 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] @@ -254,8 +258,8 @@ class NotesController < ApplicationController 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 = @notes.joins(:comments).where("note_comments.body ~ ?", params[:q]) + @notes = closed_condition(Note.all) + @notes = @notes.joins(:comments).where("to_tsvector('english', note_comments.body) @@ plainto_tsquery('english', ?)", params[:q]) # Find the notes we want to return @notes = @notes.order("updated_at DESC").limit(result_limit).preload(:comments) @@ -272,68 +276,62 @@ class NotesController < ApplicationController ## # Display a list of notes by a specified user def mine - if params[:display_name] - 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.subheading', :user => render_to_string(:partial => "user", :object => @this_user) - @page = (params[:page] || 1).to_i + if params[:display_name] + 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.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, id").uniq.offset((@page - 1) * @page_size).limit(@page_size).preload(:comments => :author).all + @notes = @this_user.notes + @notes = @notes.visible unless @user && @user.moderator? + @notes = @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] + @title = t "user.no_such_user.title" + @not_found_user = params[:display_name] - render :template => 'user/no_such_user', :status => :not_found - end + render :template => "user/no_such_user", :status => :not_found + end end end -private - #------------------------------------------------------------ - # utility functions below. - #------------------------------------------------------------ - - ## - # Render an OK response - def render_ok - if params[:format] == "js" - render :text => "osbResponse();", :content_type => "text/javascript" - else - render :text => "ok " + @note.id.to_s + "\n", :content_type => "text/plain" if @note - render :text => "ok\n", :content_type => "text/plain" unless @note - end - end + private + + #------------------------------------------------------------ + # utility functions below. + #------------------------------------------------------------ ## # Get the maximum number of results to return def result_limit - if params[:limit] and params[:limit].to_i > 0 and params[:limit].to_i < 10000 - params[:limit].to_i + if params[:limit] + if params[:limit].to_i > 0 && params[:limit].to_i <= 10000 + params[:limit].to_i + else + raise OSM::APIBadUserInput.new("Note limit must be between 1 and 10000") + end else 100 end end ## - # Generate a condition to choose which bugs we want based + # Generate a condition to choose which notes we want based # on their status and the user's request parameters def closed_condition(notes) - if params[:closed] - closed_since = params[:closed].to_i - else - closed_since = 7 - end - + closed_since = if params[:closed] + params[:closed].to_i + else + 7 + end + if closed_since < 0 - notes = notes.where("status != 'hidden'") + notes.where("status != 'hidden'") elsif closed_since > 0 - notes = notes.where("(status = 'open' OR (status = 'closed' AND closed_at > '#{Time.now - closed_since.days}'))") + notes.where("(status = 'open' OR (status = 'closed' AND closed_at > '#{Time.now - closed_since.days}'))") else - notes = notes.where("status = 'open'") + notes.where("status = 'open'") end - - return notes end ## @@ -341,17 +339,17 @@ private def add_comment(note, text, event, notify = true) attributes = { :visible => true, :event => event, :body => text } - if @user + if @user attributes[:author_id] = @user.id - else + else attributes[:author_ip] = request.remote_ip 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 notify and user and user != @user - Notifier.note_comment_notification(comment, user).deliver + note.comments.map(&:author).uniq.each do |user| + if notify && user && user != @user && user.visible? + Notifier.note_comment_notification(comment, user).deliver_now end end end