X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/f45437f83622c71468bbfb769fb892f50771b923..ef7f3d800cbdd49b692df10d312e5fd880e2e938:/app/controllers/browse_controller.rb diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb index 29cd6707f..3dfcd18e6 100644 --- a/app/controllers/browse_controller.rb +++ b/app/controllers/browse_controller.rb @@ -1,9 +1,10 @@ class BrowseController < ApplicationController layout :map_layout - before_filter :authorize_web - before_filter :set_locale - before_filter { |c| c.check_database_readable(true) } + 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 def relation @@ -57,9 +58,18 @@ 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 => 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 @user && @user.moderator? + @comments = @changeset.comments.unscope(:where => :visible).includes(:author) + else + @comments = @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