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

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

diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb
index 89b9c6ca3078aa4f8552918ae5714993dc8cbe23..6c5336908605448679b2111295883862da9c1e03 100644 (file)
--- a/app/controllers/browse_controller.rb
+++ b/app/controllers/browse_controller.rb
@@ -3,9 +3,11 @@ class BrowseController < ApplicationController
 
   before_action :authorize_web
   before_action :set_locale
 
   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
   before_action :require_oauth

+  before_action :update_totp, :only => [:query]

   around_action :web_timeout
   around_action :web_timeout

+  authorize_resource :class => false

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


@@ -17,7 +19,7 @@ class BrowseController < ApplicationController
 
   def relation_history
     @type = "relation"
 
   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
     render "history"
   rescue ActiveRecord::RecordNotFound
     render :action => "not_found", :status => :not_found


@@ -25,7 +27,7 @@ class BrowseController < ApplicationController
 
   def way
     @type = "way"
 
   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
     render "feature"
   rescue ActiveRecord::RecordNotFound
     render :action => "not_found", :status => :not_found


@@ -33,7 +35,7 @@ class BrowseController < ApplicationController
 
   def way_history
     @type = "way"
 
   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
     render "history"
   rescue ActiveRecord::RecordNotFound
     render :action => "not_found", :status => :not_found


@@ -49,7 +51,7 @@ class BrowseController < ApplicationController
 
   def node_history
     @type = "node"
 
   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
     render "history"
   rescue ActiveRecord::RecordNotFound
     render :action => "not_found", :status => :not_found


@@ -66,7 +68,7 @@ class BrowseController < ApplicationController
     @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")
     @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
       @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


@@ -87,4 +89,6 @@ class BrowseController < ApplicationController
   rescue ActiveRecord::RecordNotFound
     render :action => "not_found", :status => :not_found
   end
   rescue ActiveRecord::RecordNotFound
     render :action => "not_found", :status => :not_found
   end

+
+  def query; end

 end
 end