Merge remote-tracking branch 'upstream/pull/2596'

[rails.git] / app / controllers / browse_controller.rb

diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb
index 259ce0dc9377fa4b9e607fc8d866b945dba447f2..ebdd2cd80fbbb2dfc812ae155477639215069e01 100644 (file)
--- a/app/controllers/browse_controller.rb
+++ b/app/controllers/browse_controller.rb
@@ -1,74 +1,91 @@
 class BrowseController < ApplicationController
 class BrowseController < ApplicationController

-  layout 'site'
+  layout :map_layout

 
 

-  before_filter :set_locale
-  before_filter :authorize_web  
-  before_filter { |c| c.check_database_readable(true) }
+  before_action :authorize_web
+  before_action :set_locale
+  before_action -> { check_database_readable(true) }
+  before_action :require_oauth
+  around_action :web_timeout
+  authorize_resource :class => false

 
 

-  def start 
-  end
-  
-  
-  

   def relation
   def 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 }] )
-  rescue ActiveRecord::RecordNotFound

     @type = "relation"
     @type = "relation"

+    @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
     render :action => "not_found", :status => :not_found
   end

-  
+

   def relation_history
   def relation_history

-    @relation = Relation.find(params[:id])
-  rescue ActiveRecord::RecordNotFound

     @type = "relation"
     @type = "relation"

+    @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
     render :action => "not_found", :status => :not_found
   end

-  
+

   def way
   def 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 }] )
-  rescue ActiveRecord::RecordNotFound

     @type = "way"
     @type = "way"

+    @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
     render :action => "not_found", :status => :not_found
   end

-  
+

   def way_history
   def way_history

-    @way = Way.find(params[:id], :include => [:way_tags, {:old_ways => {:changeset => :user}}])
-  rescue ActiveRecord::RecordNotFound

     @type = "way"
     @type = "way"

+    @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
     render :action => "not_found", :status => :not_found
   end
 
   def 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 }] )
-  rescue ActiveRecord::RecordNotFound

     @type = "node"
     @type = "node"

+    @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
     render :action => "not_found", :status => :not_found
   end

-  
+

   def node_history
   def node_history

-    @node = Node.find(params[:id])
+    @type = "node"
+    @feature = Node.preload(:node_tags, :old_nodes => [:old_tags, :changeset => [:changeset_tags, :user]]).find(params[:id])
+    render "history"

   rescue ActiveRecord::RecordNotFound
   rescue ActiveRecord::RecordNotFound

-    @type = "way"

     render :action => "not_found", :status => :not_found
   end
     render :action => "not_found", :status => :not_found
   end

-  
+

   def changeset
   def changeset

+    @type = "changeset"

     @changeset = Changeset.find(params[:id])
     @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 = "Changeset | #{@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 }] ) 
+    @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
+  end
+
+  def note
+    @type = "note"
+
+    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
   rescue ActiveRecord::RecordNotFound

-    @type = "changeset"

     render :action => "not_found", :status => :not_found
   end
 end
     render :action => "not_found", :status => :not_found
   end
 end