Don't user flash[:notice] when we're not redirecting as it will

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

diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb
index dcc4cd3f31504291ef19f90b975903ad3c493c18..f3a04519cbd362b5f8133a1c7c079d7ef9dda7ff 100644 (file)
--- a/app/controllers/browse_controller.rb
+++ b/app/controllers/browse_controller.rb
@@ -1,32 +1,107 @@
 class BrowseController < ApplicationController
-  before_filter :authorize_web  
   layout 'site'
-  def way_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])
+     
+      @name = @relation.tags['name'].to_s 
+      if @name.length == 0:
+       @name = "#" + @relation.id.to_s
+      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
+  end
+  
+  def relation_history
+    begin
+      @relation = Relation.find(params[:id])
+     
+      @name = @relation.tags['name'].to_s 
+      if @name.length == 0:
+       @name = "#" + @relation.id.to_s
+      end
+       
+      @title = 'Relation History | ' + (@name)
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found
+    end
+  end
+  
+  def way 
     begin
-      way = Way.find(params[:id])
+      @way = Way.find(params[:id])
      
-      @way = way
       @name = @way.tags['name'].to_s 
       if @name.length == 0:
        @name = "#" + @way.id.to_s
-      end      
+      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
   end
-  def node_view 
+  
+  def way_history 
     begin
-      node = Node.find(params[:id])
+      @way = Way.find(params[:id])
+     
+      @name = @way.tags['name'].to_s 
+      if @name.length == 0:
+       @name = "#" + @way.id.to_s
+      end
+       
+      @title = 'Way History | ' + (@name)
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found
+    end
+  end
+
+  def node 
+    begin
+      @node = Node.find(params[:id])
      
-      @node = node
       @name = @node.tags_as_hash['name'].to_s 
       if @name.length == 0:
        @name = "#" + @node.id.to_s
-      end      
+      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
+  end
+  
+  def node_history 
+    begin
+      @node = Node.find(params[:id])
+     
+      @name = @node.tags_as_hash['name'].to_s 
+      if @name.length == 0:
+       @name = "#" + @node.id.to_s
+      end
+       
+      @title = 'Node History | ' + (@name)
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
     end