kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Including UrlFor in Redirecting and Head will warn usefully if a controller is wired up without a router included (and still support redirect_to "omg")

Browse source
This commit is contained in:
Carlhuda 2010-02-26 15:56:17 -08:00
parent 3bad24c85d
commit dae109a463
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
actionpack/lib/action_controller/metal/head.rb
View file

@ -2,6 +2,8 @@ module ActionController
module Head module Head
extend ActiveSupport::Concern extend ActiveSupport::Concern
include ActionController::UrlFor
# Return a response that has no content (merely headers). The options # Return a response that has no content (merely headers). The options
# argument is interpreted to be a hash of header names and values. # argument is interpreted to be a hash of header names and values.
# This allows you to easily return a response that consists only of # This allows you to easily return a response that consists only of
@ -24,9 +26,6 @@ module ActionController
end end
self.status = status self.status = status
# ROUTES TODO: Figure out how to rescue from a no method error
# This is needed only if you wire up a controller yourself, and
# this not working would be baffling without a better error
self.location = url_for(location) if location self.location = url_for(location) if location
self.content_type = Mime[formats.first] self.content_type = Mime[formats.first]
self.response_body = " " self.response_body = " "

4
actionpack/lib/action_controller/metal/redirecting.rb
View file

@ -12,6 +12,7 @@ module ActionController
include AbstractController::Logger include AbstractController::Logger
include ActionController::RackDelegation include ActionController::RackDelegation
include ActionController::UrlFor
# Redirects the browser to the target specified in +options+. This parameter can take one of three forms: # Redirects the browser to the target specified in +options+. This parameter can take one of three forms:
# #
@ -83,9 +84,6 @@ module ActionController
raise RedirectBackError unless refer = request.headers["Referer"] raise RedirectBackError unless refer = request.headers["Referer"]
refer refer
else else
# ROUTES TODO: Figure out how to rescue from a no method error
# This is needed only if you wire up a controller yourself, and
# this not working would be baffling without a better error
url_for(options) url_for(options)
end.gsub(/[\r\n]/, '') end.gsub(/[\r\n]/, '')
end end