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]
+ before_action :authorize_web
+ before_action :set_locale
+ before_action -> { check_database_readable(:need_api => true) }
+ before_action :require_oauth
+ before_action :update_totp, :only => [:query]
+ around_action :web_timeout
+ authorize_resource :class => false
- def start
- end
-
def relation
@type = "relation"
- @relation = Relation.find(params[:id])
- @next = Relation.visible.where("id > ?", @relation.id).order("id ASC").first
- @prev = Relation.visible.where("id < ?", @relation.id).order("id DESC").first
+ @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
end
-
+
def relation_history
@type = "relation"
- @relation = 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
end
-
+
def way
@type = "way"
- @way = Way.preload(:way_tags, :containing_relation_members, :changeset => :user, :nodes => [:node_tags, :ways => :way_tags]).find(params[:id])
- @next = Way.visible.where("id > ?", @way.id).order("id ASC").first
- @prev = Way.visible.where("id < ?", @way.id).order("id DESC").first
+ @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
end
-
+
def way_history
@type = "way"
- @way = 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
end
def node
@type = "node"
- @node = Node.find(params[:id])
- @next = Node.visible.where("id > ?", @node.id).order("id ASC").first
- @prev = Node.visible.where("id < ?", @node.id).order("id DESC").first
+ @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
end
-
+
def node_history
@type = "node"
- @node = 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
end
-
+
def changeset
@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')
-
- @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
-
- if @changeset.user.data_public?
- @next_by_user = Changeset.where("user_id = ? AND id > ?", @changeset.user_id, @changeset.id).order("id ASC").first
- @prev_by_user = Changeset.where("user_id = ? AND id < ?", @changeset.user_id, @changeset.id).order("id DESC").first
+ @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.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
rescue ActiveRecord::RecordNotFound
render :action => "not_found", :status => :not_found
def note
@type = "note"
- @note = Note.find(params[:id])
- @title = "#{I18n.t('browse.note.title')} | #{@note.id}"
- @next = Note.find(:first, :order => "id ASC", :conditions => [ "status != 'hidden' AND id > :id", { :id => @note.id }] )
- @prev = Note.find(:first, :order => "id DESC", :conditions => [ "status != 'hidden' AND id < :id", { :id => @note.id }] )
+
+ if current_user&.moderator?
+ @note = Note.find(params[:id])
+ @note_comments = @note.comments.unscope(:where => :visible)
+ else
+ @note = Note.visible.find(params[:id])
+ @note_comments = @note.comments
+ end
rescue ActiveRecord::RecordNotFound
render :action => "not_found", :status => :not_found
end
+
+ def query; end
end
projects / rails.git / blobdiff