X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9dd230d0bc7de0cdf705f3cd4b3be07ae23c154b..2a2a204125383729223083f203a04e9e6eff873d:/app/controllers/browse_controller.rb

diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb
index 377c7ced1..7d2f80eb9 100644
--- a/app/controllers/browse_controller.rb
+++ b/app/controllers/browse_controller.rb
@@ -1,15 +1,16 @@
 class BrowseController < ApplicationController
   layout :map_layout
 
-  before_filter :authorize_web  
-  before_filter :set_locale 
-  before_filter { |c| c.check_database_readable(true) }
-  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"
     @feature = Relation.find(params[:id])
-    render 'feature'
+    render "feature"
   rescue ActiveRecord::RecordNotFound
     render :action => "not_found", :status => :not_found
   end
@@ -17,7 +18,7 @@ class BrowseController < ApplicationController
   def relation_history
     @type = "relation"
     @feature = Relation.find(params[:id])
-    render 'history'
+    render "history"
   rescue ActiveRecord::RecordNotFound
     render :action => "not_found", :status => :not_found
   end
@@ -25,7 +26,7 @@ class BrowseController < ApplicationController
   def way
     @type = "way"
     @feature = Way.preload(:way_tags, :containing_relation_members, :changeset => :user, :nodes => [:node_tags, :ways => :way_tags]).find(params[:id])
-    render 'feature'
+    render "feature"
   rescue ActiveRecord::RecordNotFound
     render :action => "not_found", :status => :not_found
   end
@@ -33,7 +34,7 @@ class BrowseController < ApplicationController
   def way_history
     @type = "way"
     @feature = Way.preload(:way_tags, :old_ways => { :changeset => :user }).find(params[:id])
-    render 'feature'
+    render "history"
   rescue ActiveRecord::RecordNotFound
     render :action => "not_found", :status => :not_found
   end
@@ -41,7 +42,7 @@ class BrowseController < ApplicationController
   def node
     @type = "node"
     @feature = Node.find(params[:id])
-    render 'feature'
+    render "feature"
   rescue ActiveRecord::RecordNotFound
     render :action => "not_found", :status => :not_found
   end
@@ -49,7 +50,7 @@ class BrowseController < ApplicationController
   def node_history
     @type = "node"
     @feature = Node.find(params[:id])
-    render 'history'
+    render "history"
   rescue ActiveRecord::RecordNotFound
     render :action => "not_found", :status => :not_found
   end
@@ -57,16 +58,32 @@ class BrowseController < ApplicationController
   def changeset
     @type = "changeset"
     @changeset = Changeset.find(params[:id])
-    @node_pages, @nodes = paginate(:old_nodes, :conditions => {:changeset_id => @changeset.id}, :per_page => 10, :parameter => 'node_page')
-    @way_pages, @ways = paginate(:old_ways, :conditions => {:changeset_id => @changeset.id}, :per_page => 10, :parameter => 'way_page')
-    @relation_pages, @relations = paginate(:old_relations, :conditions => {:changeset_id => @changeset.id}, :per_page => 10, :parameter => 'relation_page')
+    @comments = if @user && @user.moderator?
+                  @changeset.comments.unscope(:where => :visible).includes(:author)
+                else
+                  @changeset.comments.includes(:author)
+                end
+    @node_pages, @nodes = paginate(:old_nodes, :conditions => { :changeset_id => @changeset.id }, :per_page => 20, :parameter => "node_page")
+    @way_pages, @ways = paginate(:old_ways, :conditions => { :changeset_id => @changeset.id }, :per_page => 20, :parameter => "way_page")
+    @relation_pages, @relations = paginate(:old_relations, :conditions => { :changeset_id => @changeset.id }, :per_page => 20, :parameter => "relation_page")
+    if @changeset.user.data_public?
+      @next_by_user = @changeset.user.changesets.where("id > ?", @changeset.id).reorder(:id => :asc).first
+      @prev_by_user = @changeset.user.changesets.where("id < ?", @changeset.id).reorder(:id => :desc).first
+    end
   rescue ActiveRecord::RecordNotFound
     render :action => "not_found", :status => :not_found
   end
 
   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