X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/686aae77325881dc73113cb76fe01f2cddec4a98..1d1f194d598e54a5d6fb4f38fb569d4138af0dc8:/app/controllers/changeset_controller.rb diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb index b880f3aa3..735fa73a8 100644 --- a/app/controllers/changeset_controller.rb +++ b/app/controllers/changeset_controller.rb @@ -210,6 +210,7 @@ class ChangesetController < ApplicationController changesets = conditions_time(changesets, params['time']) changesets = conditions_open(changesets, params['open']) changesets = conditions_closed(changesets, params['closed']) + changesets = conditions_ids(changesets, params['changesets']) # create the results document results = OSM::API.new.get_xml_doc @@ -268,7 +269,7 @@ class ChangesetController < ApplicationController return end - if request.format == :html and !params[:bbox] + if request.format == :html and !params[:list] require_oauth render :action => :history, :layout => map_layout else @@ -292,7 +293,7 @@ class ChangesetController < ApplicationController changesets = changesets.where("changesets.id <= ?", params[:max_id]) end - @edits = changesets.order("changesets.created_at DESC").limit(20).preload(:user, :changeset_tags) + @edits = changesets.order("changesets.id DESC").limit(20).preload(:user, :changeset_tags) render :action => :list, :layout => false end @@ -413,6 +414,20 @@ private end end + ## + # query changesets by a list of ids + # (either specified as array or comma-separated string) + def conditions_ids(changesets, ids) + if ids.nil? + return changesets + elsif ids.empty? + raise OSM::APIBadUserInput.new("No changesets were given to search for") + else + ids = ids.split(',').collect { |n| n.to_i } + return changesets.where(:id => ids) + end + end + ## # eliminate empty changesets (where the bbox has not been set) # this should be applied to all changeset list displays