cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix an issue where the query did not work if a display name or an id was specified

Browse source
This commit is contained in:
ENT8R 2018-10-09 14:37:55 +02:00
parent 083500f056
commit 3cdf4f3686
No known key found for this signature in database
GPG key ID: F157C7F553A0FAC4
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/controllers/notes_controller.rb
View file

@ -274,8 +274,12 @@ class NotesController < ApplicationController
# Filter by a given string
if params[:q]
# TODO: why doesn't this work if we want to filter the notes of a given user?
@notes = @notes.joins(:comments).where("to_tsvector('english', note_comments.body) @@ plainto_tsquery('english', ?)", params[:q]) unless params[:display_name] || params[:id]
@notes = @notes.joins(:comments)
if @user
@notes = @notes.where("to_tsvector('english', comments_notes.body) @@ plainto_tsquery('english', ?)", params[:q])
else
@notes = @notes.where("to_tsvector('english', note_comments.body) @@ plainto_tsquery('english', ?)", params[:q])
end
end
# Filter by a given start date and an optional end date