Simplify step mapping function

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

diff --git a/app/controllers/changesets_controller.rb b/app/controllers/changesets_controller.rb
index d5ac49d4ccc04dafa68534158470872c3132f3b9..5e79f4da62a70ac42bc4e75203c60a70d073de24 100644 (file)
--- a/app/controllers/changesets_controller.rb
+++ b/app/controllers/changesets_controller.rb
@@ -2,6 +2,7 @@
 
 class ChangesetsController < ApplicationController
   include UserMethods
+  include PaginationMethods
 
   layout "site"
 
@@ -17,12 +18,13 @@ class ChangesetsController < ApplicationController
   ##
   # list non-empty changesets in reverse chronological order
   def index
-    param! :max_id, Integer, :min => 1
+    param! :before, Integer, :min => 1
+    param! :after, Integer, :min => 1
 
-    @params = params.permit(:display_name, :bbox, :friends, :nearby, :max_id, :list)
+    @params = params.permit(:display_name, :bbox, :friends, :nearby, :before, :after, :list)
 
-    if request.format == :atom && @params[:max_id]
-      redirect_to url_for(@params.merge(:max_id => nil)), :status => :moved_permanently
+    if request.format == :atom && (@params[:before] || @params[:after])
+      redirect_to url_for(@params.merge(:before => nil, :after => nil)), :status => :moved_permanently
       return
     end
 
@@ -59,9 +61,7 @@ class ChangesetsController < ApplicationController
         changesets = changesets.where(:user => current_user.nearby)
       end
 
-      changesets = changesets.where(:changesets => { :id => ..@params[:max_id] }) if @params[:max_id]
-
-      @changesets = changesets.order("changesets.id DESC").limit(20).preload(:user, :changeset_tags, :comments)
+      @changesets, @newer_changesets_id, @older_changesets_id = get_page_items(changesets, :includes => [:user, :changeset_tags, :comments])
 
       render :action => :index, :layout => false
     end