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

Move query notes by user value to mixin

Browse source
This commit is contained in:
Anton Khorev 2023-11-21 13:08:50 +03:00
parent 500c1bddf2
commit bd278a07fe
3 changed files with 37 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/controllers/api/notes_controller.rb
View file

@ -256,19 +256,8 @@ module Api
@notes = bbox_condition(@notes)
# 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
user = query_conditions_user_value
@notes = @notes.joins(:comments).where(:note_comments => { :author_id => user }) if user
# Add any text filter
if params[:q]