X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/eaefb3ea7308112e11b03f8748cf6581c30436a5..e4504399ae55525f22a7fb47e0c47434cef8cf0a:/app/controllers/browse_controller.rb diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb index 0103516ff..61982a940 100644 --- a/app/controllers/browse_controller.rb +++ b/app/controllers/browse_controller.rb @@ -1,14 +1,11 @@ class BrowseController < ApplicationController - layout 'site', :except => [ :start ] + 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] + around_filter :web_timeout - def start - end - def relation @type = "relation" @relation = Relation.find(params[:id]) @@ -61,11 +58,10 @@ 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 @prev = Changeset.where("id < ?", @changeset.id).order(:id => :desc).first @@ -80,7 +76,6 @@ class BrowseController < ApplicationController def note @type = "note" @note = Note.find(params[:id]) - @title = "#{I18n.t('browse.note.title')} | #{@note.id}" @next = Note.visible.where("id > ?", @note.id).order(:id => :asc).first @prev = Note.visible.where("id < ?", @note.id).order(:id => :desc).first rescue ActiveRecord::RecordNotFound