X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ef7f3d800cbdd49b692df10d312e5fd880e2e938..8e404f3a468a2636481d52f245b816c41e9d5ac0:/app/controllers/browse_controller.rb diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb index 3dfcd18e6..a529b393e 100644 --- a/app/controllers/browse_controller.rb +++ b/app/controllers/browse_controller.rb @@ -10,7 +10,7 @@ class BrowseController < ApplicationController def relation @type = "relation" @feature = Relation.find(params[:id]) - render 'feature' + render "feature" rescue ActiveRecord::RecordNotFound render :action => "not_found", :status => :not_found end @@ -18,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 @@ -26,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 @@ -34,7 +34,7 @@ class BrowseController < ApplicationController def way_history @type = "way" @feature = Way.preload(:way_tags, :old_ways => { :changeset => :user }).find(params[:id]) - render 'history' + render "history" rescue ActiveRecord::RecordNotFound render :action => "not_found", :status => :not_found end @@ -42,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 @@ -50,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 @@ -63,9 +63,9 @@ class BrowseController < ApplicationController 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') + @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