Merged 14009:14059 from trunk.

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

diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb
index 94a8a09a0c49b1a5f9d30466aed8c7927fda20ae..237c57ab232db987f1b385100f01acf91289263f 100644 (file)
--- a/app/controllers/browse_controller.rb
+++ b/app/controllers/browse_controller.rb
@@ -8,7 +8,7 @@ class BrowseController < ApplicationController
   end
   
   def index
-    @nodes = Node.find(:all, :order => "timestamp DESC", :limit=> 20)  
+    @changesets = Changeset.find(:all, :order => "closed_at DESC", :conditions => ['closed_at < ?', DateTime.now], :limit=> 20)
   end
   
   def relation 
@@ -116,8 +116,13 @@ class BrowseController < ApplicationController
   def changeset
     begin
       @changeset = Changeset.find(params[:id])
+      @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')
       
       @title = "Changeset | #{@changeset.id}"
+      @next = Changeset.find(:first, :order => "id ASC", :conditions => [ "id > :id", { :id => @changeset.id }] ) 
+      @prev = Changeset.find(:first, :order => "id DESC", :conditions => [ "id < :id", { :id => @changeset.id }] ) 
     rescue ActiveRecord::RecordNotFound
       @type = "changeset"
       render :action => "not_found", :status => :not_found