X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e731dd71a77ad4ad1e9db22535e89444bb98e5d9..0fb725ea611e7788a05bcb39bbf65ccdfe7ae505:/app/controllers/browse_controller.rb diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb index ebdd2cd80..1bbf85adc 100644 --- a/app/controllers/browse_controller.rb +++ b/app/controllers/browse_controller.rb @@ -18,7 +18,7 @@ class BrowseController < ApplicationController def relation_history @type = "relation" - @feature = Relation.preload(:relation_tags, :old_relations => [:old_tags, :changeset => [:changeset_tags, :user], :old_members => :member]).find(params[:id]) + @feature = Relation.preload(:relation_tags, :old_relations => [:old_tags, { :changeset => [:changeset_tags, :user], :old_members => :member }]).find(params[:id]) render "history" rescue ActiveRecord::RecordNotFound render :action => "not_found", :status => :not_found @@ -26,7 +26,7 @@ class BrowseController < ApplicationController def way @type = "way" - @feature = Way.preload(:way_tags, :containing_relation_members, :changeset => [:changeset_tags, :user], :nodes => [:node_tags, :ways => :way_tags]).find(params[:id]) + @feature = Way.preload(:way_tags, :containing_relation_members, :changeset => [:changeset_tags, :user], :nodes => [:node_tags, { :ways => :way_tags }]).find(params[:id]) render "feature" rescue ActiveRecord::RecordNotFound render :action => "not_found", :status => :not_found @@ -34,7 +34,7 @@ class BrowseController < ApplicationController def way_history @type = "way" - @feature = Way.preload(:way_tags, :old_ways => [:old_tags, :changeset => [:changeset_tags, :user], :old_nodes => { :node => [:node_tags, :ways] }]).find(params[:id]) + @feature = Way.preload(:way_tags, :old_ways => [:old_tags, { :changeset => [:changeset_tags, :user], :old_nodes => { :node => [:node_tags, :ways] } }]).find(params[:id]) render "history" rescue ActiveRecord::RecordNotFound render :action => "not_found", :status => :not_found @@ -50,7 +50,7 @@ class BrowseController < ApplicationController def node_history @type = "node" - @feature = Node.preload(:node_tags, :old_nodes => [:old_tags, :changeset => [:changeset_tags, :user]]).find(params[:id]) + @feature = Node.preload(:node_tags, :old_nodes => [:old_tags, { :changeset => [:changeset_tags, :user] }]).find(params[:id]) render "history" rescue ActiveRecord::RecordNotFound render :action => "not_found", :status => :not_found