Disable the data browswer when the database is not available.

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

diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb
index e679442c196cf02e8a7e7edda379b932cf09a437..f3a04519cbd362b5f8133a1c7c079d7ef9dda7ff 100644 (file)
--- a/app/controllers/browse_controller.rb
+++ b/app/controllers/browse_controller.rb
@@ -1,8 +1,17 @@
 class BrowseController < ApplicationController
-  before_filter :authorize_web  
   layout 'site'
 
-  def relation_view 
+  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 relation 
     begin
       @relation = Relation.find(params[:id])
      
@@ -12,6 +21,8 @@ class BrowseController < ApplicationController
       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
@@ -32,7 +43,7 @@ class BrowseController < ApplicationController
     end
   end
   
-  def way_view 
+  def way 
     begin
       @way = Way.find(params[:id])
      
@@ -42,6 +53,8 @@ class BrowseController < ApplicationController
       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
@@ -62,7 +75,7 @@ class BrowseController < ApplicationController
     end
   end
 
-  def node_view 
+  def node 
     begin
       @node = Node.find(params[:id])
      
@@ -72,6 +85,8 @@ class BrowseController < ApplicationController
       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
@@ -86,7 +101,7 @@ class BrowseController < ApplicationController
        @name = "#" + @node.id.to_s
       end
        
-      @title = 'Node | ' + (@name)
+      @title = 'Node History | ' + (@name)
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
     end