X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7de9f6a977fe2fd0f8c4906b43946d472e4eb880..1e0377e6b38aac74a7da221d22b3248ec69b50d7:/app/controllers/notes_controller.rb

diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index 97efc3eda..574c9b8b7 100644
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -16,12 +16,15 @@ class NotesController < ApplicationController
   ##
   # Display a list of notes by a specified user
   def index
-    @params = params.permit(:display_name)
+    param! :page, Integer, :min => 1
+
+    @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"
@@ -37,9 +40,16 @@ class NotesController < ApplicationController
       @note = Note.visible.find(params[:id])
       @note_comments = @note.comments
     end
+
+    @note_includes_anonymous = @note.author.nil? || @note_comments.find { |comment| comment.author.nil? }
+
+    @note_comments = @note_comments.drop(1) unless !@note.author.nil? && @note.author.status == "deleted"
   rescue ActiveRecord::RecordNotFound
     render :template => "browse/not_found", :status => :not_found
   end
 
-  def new; end
+  def new
+    @anonymous_notes_count = request.cookies["_osm_anonymous_notes_count"].to_i || 0
+    render :action => :new_readonly if api_status != "online"
+  end
 end