Merge 7922:8377 from trunk.

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

diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb
index 5e55de13b9e09204af988e3c3e1af678765e576f..fd482119d91870f680b1d204dc330bec7bd7f60f 100644 (file)
--- a/app/controllers/browse_controller.rb
+++ b/app/controllers/browse_controller.rb
@@ -2,6 +2,13 @@ class BrowseController < ApplicationController
   before_filter :authorize_web  
   layout 'site'
 
   before_filter :authorize_web  
   layout 'site'
 

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

   def relation 
     begin
       @relation = Relation.find(params[:id])
   def relation 
     begin
       @relation = Relation.find(params[:id])


@@ -12,6 +19,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


@@ -42,6 +51,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


@@ -72,6 +83,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