X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6c2432ae423c6744b8443c63d0e02e1ccc2d3011..40589960bead84a691fd38230be82b6922921445:/app/controllers/browse_controller.rb diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb index 0fccbb506..50d0ae0a5 100644 --- a/app/controllers/browse_controller.rb +++ b/app/controllers/browse_controller.rb @@ -3,7 +3,7 @@ class BrowseController < ApplicationController before_action :authorize_web before_action :set_locale - before_action(:except => [:query]) { |c| c.check_database_readable(true) } + before_action -> { check_database_readable(:need_api => true) } before_action :require_oauth around_action :web_timeout authorize_resource :class => false @@ -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