Use "user" as user id parameter for notes searches

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

diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index 120b0d17de6e2001bb38a4aec7d8ec57b6a0a854..2fb9f826777d50829931bf1a62a2d1fa8cb01bb0 100644 (file)
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -259,9 +259,9 @@ class NotesController < ApplicationController
     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
+    elsif params[:user]
+      @user = User.find_by(:id => params[:user])
+      raise OSM::APIBadUserInput, "User #{params[:user]} not known" unless @user
     end
 
     @notes = closed_condition(Note.all)
@@ -288,7 +288,7 @@ 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