From: Anton Khorev <tony29@yandex.ru>
Date: Sun, 20 Aug 2023 22:52:13 +0000 (+0300)
Subject: Lookup user before action in user's notes list
X-Git-Tag: live~669^2
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/7de9f6a977fe2fd0f8c4906b43946d472e4eb880?ds=sidebyside;hp=-c

Lookup user before action in user's notes list
---

7de9f6a977fe2fd0f8c4906b43946d472e4eb880
diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index 0bca294be..97efc3eda 100644
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -9,27 +9,22 @@ class NotesController < ApplicationController
 
   authorize_resource
 
+  before_action :lookup_user, :only => [:index]
   before_action :set_locale
   around_action :web_timeout
 
   ##
   # Display a list of notes by a specified user
   def index
-    if params[:display_name]
-      if @user = User.active.find_by(:display_name => params[:display_name])
-        @params = params.permit(:display_name)
-        @title = t ".title", :user => @user.display_name
-        @page = (params[:page] || 1).to_i
-        @page_size = 10
-        @notes = @user.notes
-        @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"
-      else
-        render_unknown_user params[:display_name]
-      end
-    end
+    @params = params.permit(:display_name)
+    @title = t ".title", :user => @user.display_name
+    @page = (params[:page] || 1).to_i
+    @page_size = 10
+    @notes = @user.notes
+    @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"
   end
 
   def show