X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/9fb8f5a84bfa96a299dfd1457c185181f15835d8..ad3ba427b7971fac6b504118ed865246852cf14e:/app/controllers/notes_controller.rb diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb index f1ac6baa8..2973a26c2 100644 --- a/app/controllers/notes_controller.rb +++ b/app/controllers/notes_controller.rb @@ -283,7 +283,9 @@ class NotesController < ApplicationController @description = t "note.mine.subheading", :user => render_to_string(:partial => "user", :object => @this_user) @page = (params[:page] || 1).to_i @page_size = 10 - @notes = @this_user.notes.order("updated_at DESC, id").uniq.offset((@page - 1) * @page_size).limit(@page_size).preload(:comments => :author).to_a + @notes = @this_user.notes + @notes = @notes.visible unless @user && @user.moderator? + @notes = @notes.order("updated_at DESC, id").uniq.offset((@page - 1) * @page_size).limit(@page_size).preload(:comments => :author).to_a else @title = t "user.no_such_user.title" @not_found_user = params[:display_name] @@ -299,17 +301,6 @@ class NotesController < ApplicationController # utility functions below. #------------------------------------------------------------ - ## - # Render an OK response - def render_ok - if params[:format] == "js" - render :text => "osbResponse();", :content_type => "text/javascript" - else - render :text => "ok " + @note.id.to_s + "\n", :content_type => "text/plain" if @note - render :text => "ok\n", :content_type => "text/plain" unless @note - end - end - ## # Get the maximum number of results to return def result_limit