X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/7953a883d003b47859f53ea40ccd1db5dae9e040..2dc7c505fd33b2ae76ae21d871ff0fe8ce2bcdcb:/app/controllers/old_controller.rb diff --git a/app/controllers/old_controller.rb b/app/controllers/old_controller.rb index e137554d5..c23df70df 100644 --- a/app/controllers/old_controller.rb +++ b/app/controllers/old_controller.rb @@ -14,9 +14,14 @@ class OldController < ApplicationController after_filter :compress_output around_filter :api_call_handle_error, :api_call_timeout before_filter :lookup_old_element, :except => [ :history ] - before_filter :lookup_old_elements_via_current, :only => [ :history ] + before_filter :lookup_old_element_versions, :only => [ :history ] def history + # the .where() method used in the lookup_old_element_versions + # call won't throw an error if no records are found, so we have + # to do that ourselves. + raise OSM::APINotFoundError.new if @elements.empty? + doc = OSM::API.new.get_xml_doc visible_elements = if show_redactions? @@ -50,8 +55,7 @@ class OldController < ApplicationController redaction_id = params['redaction'] unless redaction_id.nil? # if a redaction ID was specified, then set this element to - # be redacted in that redaction. (TODO: check that the - # user doing the redaction owns the redaction object too) + # be redacted in that redaction. redaction = Redaction.find(redaction_id.to_i) @old_element.redact!(redaction)