Doing a resync from mainline 8633:10895. There was one simple to resolve conflict...

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

diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb
index 97daaa268d844527b40b5a895d20f1d20dfdd8aa..f3a04519cbd362b5f8133a1c7c079d7ef9dda7ff 100644 (file)
--- a/app/controllers/browse_controller.rb
+++ b/app/controllers/browse_controller.rb
@@ -1,7 +1,12 @@
 class BrowseController < ApplicationController
 class BrowseController < ApplicationController

-  before_filter :authorize_web  

   layout 'site'
 
   layout 'site'
 

+  before_filter :authorize_web  
+  before_filter { |c| c.check_database_availability(true) }
+
+  def start 
+  end
+  

   def index
     @nodes = Node.find(:all, :order => "timestamp DESC", :limit=> 20)  
   end
   def index
     @nodes = Node.find(:all, :order => "timestamp DESC", :limit=> 20)  
   end


@@ -16,6 +21,8 @@ class BrowseController < ApplicationController
       end
        
       @title = 'Relation | ' + (@name)
       end
        
       @title = 'Relation | ' + (@name)

+      @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
       render :nothing => true, :status => :not_found
     end
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
     end


@@ -46,6 +53,8 @@ class BrowseController < ApplicationController
       end
        
       @title = 'Way | ' + (@name)
       end
        
       @title = 'Way | ' + (@name)

+      @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
       render :nothing => true, :status => :not_found
     end
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
     end


@@ -76,6 +85,8 @@ class BrowseController < ApplicationController
       end
        
       @title = 'Node | ' + (@name)
       end
        
       @title = 'Node | ' + (@name)

+      @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
       render :nothing => true, :status => :not_found
     end
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
     end