X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/4557654ba63392f0db4aa5c002be692395eb8cee..4bb0785ad5bdad8fc8fcbbe35c61f585f58f4cce:/app/controllers/browse_controller.rb diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb index 638cb7302..cbb0f2023 100644 --- a/app/controllers/browse_controller.rb +++ b/app/controllers/browse_controller.rb @@ -1,14 +1,10 @@ class BrowseController < ApplicationController - layout 'map' + layout :map_layout before_filter :authorize_web before_filter :set_locale before_filter { |c| c.check_database_readable(true) } - around_filter :web_timeout, :except => [:start] - - def start - render :layout => false - end + around_filter :web_timeout def relation @type = "relation" @@ -62,9 +58,9 @@ class BrowseController < ApplicationController @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') + @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') @title = "#{I18n.t('browse.changeset.title')} | #{@changeset.id}" @next = Changeset.where("id > ?", @changeset.id).order(:id => :asc).first