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

Lookup user before action in user's notes list

Browse source
This commit is contained in:
Anton Khorev 2023-08-21 01:52:13 +03:00
parent 2d39ba7954
commit 7de9f6a977
1 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

23
app/controllers/notes_controller.rb
View file

@ -9,27 +9,22 @@ class NotesController < ApplicationController
authorize_resource authorize_resource
before_action :lookup_user, :only => [:index]
before_action :set_locale before_action :set_locale
around_action :web_timeout around_action :web_timeout
## ##
# Display a list of notes by a specified user # Display a list of notes by a specified user
def index def index
if params[:display_name] @params = params.permit(:display_name)
if @user = User.active.find_by(:display_name => params[:display_name]) @title = t ".title", :user => @user.display_name
@params = params.permit(:display_name) @page = (params[:page] || 1).to_i
@title = t ".title", :user => @user.display_name @page_size = 10
@page = (params[:page] || 1).to_i @notes = @user.notes
@page_size = 10 @notes = @notes.visible unless current_user&.moderator?
@notes = @user.notes @notes = @notes.order("updated_at DESC, id").distinct.offset((@page - 1) * @page_size).limit(@page_size).preload(:comments => :author)
@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)
render :layout => "site" render :layout => "site"
else
render_unknown_user params[:display_name]
end
end
end end
def show def show