Simplify

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

diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb
index 727522510f7563b9a47060dc5aa9ffd73117fb55..bd908879fe423c71a861bab62d0339d53b7703a4 100644 (file)
--- a/app/controllers/changeset_controller.rb
+++ b/app/controllers/changeset_controller.rb
@@ -252,6 +252,8 @@ class ChangesetController < ApplicationController
   def list
     if request.format == :atom and params[:page]
       redirect_to params.merge({ :page => nil }), :status => :moved_permanently
   def list
     if request.format == :atom and params[:page]
       redirect_to params.merge({ :page => nil }), :status => :moved_permanently

+    elsif request.format == :html and !params[:bbox]
+      render :action => :history, :layout => map_layout

     else
       changesets = conditions_nonempty(Changeset.all)
 
     else
       changesets = conditions_nonempty(Changeset.all)
 


@@ -289,39 +291,16 @@ class ChangesetController < ApplicationController
       end
 
       if params[:bbox]
       end
 
       if params[:bbox]

-        bbox = BoundingBox.from_bbox_params(params)
-      elsif params[:minlon] and params[:minlat] and params[:maxlon] and params[:maxlat]
-        bbox = BoundingBox.from_lon_lat_params(params)
+        changesets = conditions_bbox(changesets, BoundingBox.from_bbox_params(params))

       end
 
       end
 

-      if bbox
-        changesets = conditions_bbox(changesets, bbox)
+      if params[:max_id]
+        changesets = changesets.where("changesets.id <= ?", params[:max_id])

       end
 
       end
 

-      if user
-        user_link = render_to_string :partial => "user", :object => user
-      end
-
-      if params[:friends] and @user
-        @title =  t 'changeset.list.title_friend'
-        @heading =  t 'changeset.list.title_friend'
-      elsif params[:nearby] and @user
-        @title = t 'changeset.list.title_nearby'
-        @heading = t 'changeset.list.title_nearby'
-      elsif user
-        @title =  t 'changeset.list.title_user', :user => user.display_name
-        @heading =  t('changeset.list.title_user', :user => user_link).html_safe
-      else
-        @title =  t 'changeset.list.title'
-        @heading =  t 'changeset.list.title'
-      end
-
-      @page = (params[:page] || 1).to_i
-      @page_size = 20
-
-      @edits = changesets.order("changesets.created_at DESC").offset((@page - 1) * @page_size).limit(@page_size).preload(:user, :changeset_tags)
+      @edits = changesets.order("changesets.created_at DESC").limit(20).preload(:user, :changeset_tags)

 
 

-      render :action => :list, :layout => 'map'
+      render :action => :list, :layout => false

     end
   end
 
     end
   end