Merge remote-tracking branch 'openstreetmap/pull/1040'

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

diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb
index a529b393eb954d29386e936388f0115a97adae63..0ac45b9261d1a4dcc1a1d6135747ca6489fd5f40 100644 (file)
--- a/app/controllers/browse_controller.rb
+++ b/app/controllers/browse_controller.rb
@@ -1,11 +1,11 @@
 class BrowseController < ApplicationController
   layout :map_layout
 
 class BrowseController < ApplicationController
   layout :map_layout
 

-  before_filter :authorize_web
-  before_filter :set_locale
-  before_filter :except => [:query] { |c| c.check_database_readable(true) }
-  before_filter :require_oauth
-  around_filter :web_timeout
+  before_action :authorize_web
+  before_action :set_locale
+  before_action :except => [:query] { |c| c.check_database_readable(true) }
+  before_action :require_oauth
+  around_action :web_timeout

 
   def relation
     @type = "relation"
 
   def relation
     @type = "relation"


@@ -76,7 +76,14 @@ class BrowseController < ApplicationController
 
   def note
     @type = "note"
 
   def note
     @type = "note"

-    @note = Note.find(params[:id])
+
+    if @user && @user.moderator?
+      @note = Note.find(params[:id])
+      @note_comments = @note.comments.unscope(:where => :visible)
+    else
+      @note = Note.visible.find(params[:id])
+      @note_comments = @note.comments
+    end

   rescue ActiveRecord::RecordNotFound
     render :action => "not_found", :status => :not_found
   end
   rescue ActiveRecord::RecordNotFound
     render :action => "not_found", :status => :not_found
   end