class BrowseController < ApplicationController
- layout 'site'
+ layout :map_layout
- before_filter :authorize_web
- before_filter :set_locale
- before_filter { |c| c.check_database_readable(true) }
- around_filter :timeout, :except => [:start]
+ before_action :authorize_web
+ before_action :set_locale
+ before_action(:except => [:query]) { |c| c.check_database_readable(true) }
+ before_action :require_oauth
+ around_action :web_timeout
- def start
- end
-
def relation
@type = "relation"
- @relation = Relation.find(params[:id])
- @next = Relation.find(:first, :order => "id ASC", :conditions => [ "visible = true AND id > :id", { :id => @relation.id }] )
- @prev = Relation.find(:first, :order => "id DESC", :conditions => [ "visible = true AND id < :id", { :id => @relation.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
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.find(params[:id], :include => [:way_tags, {:changeset => :user}, {:nodes => [:node_tags, {:ways => :way_tags}]}, :containing_relation_members])
- @next = Way.find(:first, :order => "id ASC", :conditions => [ "visible = true AND id > :id", { :id => @way.id }] )
- @prev = Way.find(:first, :order => "id DESC", :conditions => [ "visible = true AND id < :id", { :id => @way.id }] )
-
- # Used for edit link, takes approx middle node of way
- @midnode = @way.nodes[@way.nodes.length/2]
+ @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.find(params[:id], :include => [:way_tags, {:old_ways => {:changeset => :user}}])
+ @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.find(:first, :order => "id ASC", :conditions => [ "visible = true AND id > :id", { :id => @node.id }] )
- @prev = Node.find(:first, :order => "id DESC", :conditions => [ "visible = true AND id < :id", { :id => @node.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
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.find(:first, :order => "id ASC", :conditions => [ "id > :id", { :id => @changeset.id }] )
- @prev = Changeset.find(:first, :order => "id DESC", :conditions => [ "id < :id", { :id => @changeset.id }] )
-
- @next_by_user = Changeset.find(:first, :order => "id ASC", :conditions => [ "id > :id AND user_id = :user_id", {:id => @changeset.id, :user_id => @changeset.user_id }] )
- @prev_by_user = Changeset.find(:first, :order => "id DESC", :conditions => [ "id < :id AND user_id = :user_id", {:id => @changeset.id, :user_id => @changeset.user_id }] )
- rescue ActiveRecord::RecordNotFound
- render :action => "not_found", :status => :not_found
- end
-
- def bug
- @type = "bug"
- @bug = MapBug.find(params[:id])
- @next = MapBug.find(:first, :order => "id ASC", :conditions => [ "status != 'hidden' AND id > :id", { :id => @bug.id }] )
- @prev = MapBug.find(:first, :order => "id DESC", :conditions => [ "status != 'hidden' AND id < :id", { :id => @bug.id }] )
+ @comments = if current_user && 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?
+ @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
end
-private
+ def note
+ @type = "note"
- def timeout
- SystemTimer.timeout_after(30) do
- yield
- end
- rescue ActionView::TemplateError => ex
- if ex.original_exception.is_a?(Timeout::Error)
- render :action => "timeout", :status => :request_timeout
+ if current_user && current_user.moderator?
+ @note = Note.find(params[:id])
+ @note_comments = @note.comments.unscope(:where => :visible)
else
- raise
+ @note = Note.visible.find(params[:id])
+ @note_comments = @note.comments
end
- rescue Timeout::Error
- render :action => "timeout", :status => :request_timeout
+ rescue ActiveRecord::RecordNotFound
+ render :action => "not_found", :status => :not_found
end
end
projects / rails.git / blobdiff