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

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

diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index 120b0d17de6e2001bb38a4aec7d8ec57b6a0a854..95566a1a1a5ff179f1019dea52eed6d20235e8c7 100644 (file)
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -255,23 +255,28 @@ class NotesController < ApplicationController
   ##
   # Return a list of notes matching a given string
   def search
-    # Filter either by the name or the id of the 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
-    elsif params[:id]
-      @user = User.find_by(:id => params[:id])
-      raise OSM::APIBadUserInput, "User #{params[:id]} not known" unless @user
-    end
-
+    # Get the initial set of notes
     @notes = closed_condition(Note.all)
 
-    @notes = @notes.joins(:comments).where(:note_comments => { :author_id => @user }) if @user
+    # 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
 
-    # Filter by a given string
+      @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]
 
-    # Filter by a given start date and an optional end date
+    # Add any date filter
     if params[:from]
       begin
         from = Time.parse(params[:from])
@@ -288,7 +293,8 @@ class NotesController < ApplicationController
       rescue ArgumentError
         raise OSM::APIBadUserInput, "Date #{params[:to]} is in a wrong format"
       end
-      @notes = @notes.where(:created_at => from .. to)
+
+      @notes = @notes.where(:created_at => from..to)
     end
 
     # Find the notes we want to return