Merge remote-tracking branch 'upstream/pull/5353'

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

diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index 26d27692e5cd5804386aca35191e68e26bbd7dbe..c47a3abfb9a1e3d605b0fb3e7d92cc072de6fffa 100644 (file)
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -18,12 +18,13 @@ class NotesController < ApplicationController
   def index
     param! :page, Integer, :min => 1
 
-    @params = params.permit(:display_name)
+    @params = params.permit(:display_name, :status)
     @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.where(:status => params[:status]) unless params[:status] == "all" || params[:status].blank?
     @notes = @notes.order("updated_at DESC, id").distinct.offset((@page - 1) * @page_size).limit(@page_size).preload(:comments => :author)
 
     render :layout => "site"