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

[rails.git] / app / controllers / notes_controller.rb

diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index 92f63e304f76c539b009cdbbfff4d593e8236447..036238db1abae3c5dcc9e42dd113208e0c4a7470 100644 (file)
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -4,11 +4,13 @@ class NotesController < ApplicationController
   skip_before_action :verify_authenticity_token, :except => [:mine]
   before_action :check_api_readable
   before_action :authorize_web, :only => [:mine]
   skip_before_action :verify_authenticity_token, :except => [:mine]
   before_action :check_api_readable
   before_action :authorize_web, :only => [:mine]

-  before_action :setup_user_auth, :only => [:create, :comment]
+  before_action :setup_user_auth, :only => [:create, :comment, :show]

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

-  before_action :require_moderator, :only => [:destroy]
+  before_action :api_deny_access_handler, :except => [:mine]
+
+  authorize_resource
+

   before_action :check_api_writable, :only => [:create, :comment, :close, :reopen, :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
 
   before_action :set_locale
   around_action :api_call_handle_error, :api_call_timeout
 


@@ -53,7 +55,7 @@ class NotesController < ApplicationController
   # Create a new note
   def create
     # Check the ACLs
   # Create a new note
   def create
     # Check the ACLs

-    raise OSM::APIAccessDenied if Acl.no_note_comment(request.remote_ip)
+    raise OSM::APIAccessDenied if current_user.nil? && Acl.no_note_comment(request.remote_ip)

 
     # Check the arguments are sane
     raise OSM::APIBadUserInput, "No lat was given" unless params[:lat]
 
     # Check the arguments are sane
     raise OSM::APIBadUserInput, "No lat was given" unless params[:lat]


@@ -89,7 +91,7 @@ class NotesController < ApplicationController
   # Add a comment to an existing note
   def comment
     # Check the ACLs
   # Add a comment to an existing note
   def comment
     # Check the ACLs

-    raise OSM::APIAccessDenied if Acl.no_note_comment(request.remote_ip)
+    raise OSM::APIAccessDenied if current_user.nil? && Acl.no_note_comment(request.remote_ip)

 
     # Check the arguments are sane
     raise OSM::APIBadUserInput, "No id was given" unless params[:id]
 
     # Check the arguments are sane
     raise OSM::APIBadUserInput, "No id was given" unless params[:id]


@@ -211,7 +213,7 @@ class NotesController < ApplicationController
     # Find the note and check it is valid
     @note = Note.find(params[:id])
     raise OSM::APINotFoundError unless @note
     # Find the note and check it is valid
     @note = Note.find(params[:id])
     raise OSM::APINotFoundError unless @note

-    raise OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible?
+    raise OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible? || current_user&.moderator?

 
     # Render the result
     respond_to do |format|
 
     # Render the result
     respond_to do |format|


@@ -255,12 +257,47 @@ class NotesController < ApplicationController
   ##
   # Return a list of notes matching a given string
   def search
   ##
   # Return a list of notes matching a given string
   def search

-    # Check the arguments are sane
-    raise OSM::APIBadUserInput, "No query string was given" unless params[:q]
-
-    # Get any conditions that need to be applied
+    # Get the initial set of notes

     @notes = closed_condition(Note.all)
     @notes = closed_condition(Note.all)

-    @notes = @notes.joins(:comments).where("to_tsvector('english', note_comments.body) @@ plainto_tsquery('english', ?)", params[:q])
+
+    # Add any user filter
+    if params[:display_name] || params[:user]
+      if params[:display_name]
+        @user = User.find_by(:display_name => params[:display_name])
+
+        raise OSM::APIBadUserInput, "User #{params[:display_name]} not known" unless @user
+      else
+        @user = User.find_by(:id => params[:user])
+
+        raise OSM::APIBadUserInput, "User #{params[:user]} not known" unless @user
+      end
+
+      @notes = @notes.joins(:comments).where(:note_comments => { :author_id => @user })
+    end
+
+    # Add any text filter
+    @notes = @notes.joins(:comments).where("to_tsvector('english', note_comments.body) @@ plainto_tsquery('english', ?)", params[:q]) if params[:q]
+
+    # Add any date filter
+    if params[:from]
+      begin
+        from = Time.parse(params[:from])
+      rescue ArgumentError
+        raise OSM::APIBadUserInput, "Date #{params[:from]} is in a wrong format"
+      end
+
+      begin
+        to = if params[:to]
+               Time.parse(params[:to])
+             else
+               Time.now
+             end
+      rescue ArgumentError
+        raise OSM::APIBadUserInput, "Date #{params[:to]} is in a wrong format"
+      end
+
+      @notes = @notes.where(:created_at => from..to)
+    end

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


@@ -278,21 +315,21 @@ class NotesController < ApplicationController
   # Display a list of notes by a specified user
   def mine
     if params[:display_name]
   # 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])
+      if @user = User.active.find_by(:display_name => params[:display_name])

         @params = params.permit(:display_name)
         @params = params.permit(: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)
+        @title = t "notes.mine.title", :user => @user.display_name
+        @heading = t "notes.mine.heading", :user => @user.display_name
+        @description = t "notes.mine.subheading", :user => render_to_string(:partial => "user", :object => @user)

         @page = (params[:page] || 1).to_i
         @page_size = 10
         @page = (params[:page] || 1).to_i
         @page_size = 10

-        @notes = @this_user.notes
-        @notes = @notes.visible unless current_user && current_user.moderator?
+        @notes = @user.notes
+        @notes = @notes.visible unless current_user&.moderator?

         @notes = @notes.order("updated_at DESC, id").distinct.offset((@page - 1) * @page_size).limit(@page_size).preload(:comments => :author).to_a
       else
         @notes = @notes.order("updated_at DESC, id").distinct.offset((@page - 1) * @page_size).limit(@page_size).preload(:comments => :author).to_a
       else

-        @title = t "user.no_such_user.title"
+        @title = t "users.no_such_user.title"

         @not_found_user = params[:display_name]
 
         @not_found_user = params[:display_name]
 

-        render :template => "user/no_such_user", :status => :not_found
+        render :template => "users/no_such_user", :status => :not_found

       end
     end
   end
       end
     end
   end


@@ -307,7 +344,7 @@ class NotesController < ApplicationController
   # Get the maximum number of results to return
   def result_limit
     if params[:limit]
   # Get the maximum number of results to return
   def result_limit
     if params[:limit]

-      if params[:limit].to_i > 0 && params[:limit].to_i <= 10000
+      if params[:limit].to_i.positive? && params[:limit].to_i <= 10000

         params[:limit].to_i
       else
         raise OSM::APIBadUserInput, "Note limit must be between 1 and 10000"
         params[:limit].to_i
       else
         raise OSM::APIBadUserInput, "Note limit must be between 1 and 10000"


@@ -327,12 +364,14 @@ class NotesController < ApplicationController
                      7
                    end
 
                      7
                    end
 

-    if closed_since < 0
-      notes.where("status != 'hidden'")
-    elsif closed_since > 0
-      notes.where("(status = 'open' OR (status = 'closed' AND closed_at > '#{Time.now - closed_since.days}'))")
+    if closed_since.negative?
+      notes.where.not(:status => "hidden")
+    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)))

     else
     else

-      notes.where("status = 'open'")
+      notes.where(:status => "open")

     end
   end
 
     end
   end
 


@@ -350,9 +389,7 @@ class NotesController < ApplicationController
     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|

-      if notify && user && user != current_user && user.visible?
-        Notifier.note_comment_notification(comment, user).deliver_now
-      end
+      Notifier.note_comment_notification(comment, user).deliver_later if notify && user && user != current_user && user.visible?

     end
   end
 end
     end
   end
 end