X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9a9b045372a6f48420a9a6dacfde52c34ab7abce..edd49e85823079d6de19cbc9f89c6abc0568382b:/app/controllers/browse_controller.rb?ds=inline diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb index 0ac45b926..ebdd2cd80 100644 --- a/app/controllers/browse_controller.rb +++ b/app/controllers/browse_controller.rb @@ -3,13 +3,14 @@ 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(true) } before_action :require_oauth around_action :web_timeout + authorize_resource :class => false def relation @type = "relation" - @feature = Relation.find(params[:id]) + @feature = Relation.preload(:relation_tags, :containing_relation_members, :changeset => [:changeset_tags, :user], :relation_members => :member).find(params[:id]) render "feature" rescue ActiveRecord::RecordNotFound render :action => "not_found", :status => :not_found @@ -17,7 +18,7 @@ class BrowseController < ApplicationController def relation_history @type = "relation" - @feature = Relation.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 @@ -25,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]) + @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 @@ -33,7 +34,7 @@ class BrowseController < ApplicationController def way_history @type = "way" - @feature = Way.preload(:way_tags, :old_ways => { :changeset => :user }).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 @@ -41,7 +42,7 @@ class BrowseController < ApplicationController def node @type = "node" - @feature = Node.find(params[:id]) + @feature = Node.preload(:node_tags, :containing_relation_members, :changeset => [:changeset_tags, :user], :ways => :way_tags).find(params[:id]) render "feature" rescue ActiveRecord::RecordNotFound render :action => "not_found", :status => :not_found @@ -49,7 +50,7 @@ class BrowseController < ApplicationController def node_history @type = "node" - @feature = Node.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 @@ -58,15 +59,15 @@ class BrowseController < ApplicationController def changeset @type = "changeset" @changeset = Changeset.find(params[:id]) - if @user && @user.moderator? - @comments = @changeset.comments.unscope(:where => :visible).includes(:author) - else - @comments = @changeset.comments.includes(:author) - end + @comments = if current_user&.moderator? + @changeset.comments.unscope(:where => :visible).includes(:author) + else + @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") - if @changeset.user.data_public? + if @changeset.user.active? && @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 end @@ -77,7 +78,7 @@ class BrowseController < ApplicationController def note @type = "note" - if @user && @user.moderator? + if current_user&.moderator? @note = Note.find(params[:id]) @note_comments = @note.comments.unscope(:where => :visible) else