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

Make action_has_layout? non-private

Browse source
This commit is contained in:
Carlhuda 2010-03-18 13:47:40 -07:00
parent 3deb60e6b4
commit d8c7efece6
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
actionpack/lib/abstract_controller/layouts.rb
View file

@ -184,7 +184,7 @@ module AbstractController
#
# ==== Returns
# Boolean:: True if the action has a layout, false otherwise.
def _action_has_layout?
def action_has_layout?
conditions = _layout_conditions
if only = conditions[:only]
@ -336,13 +336,13 @@ module AbstractController
# Template:: The template object for the default layout (or nil)
def _default_layout(require_layout = false)
begin
layout_name = _layout if _action_has_layout?
layout_name = _layout if action_has_layout?
rescue NameError => e
raise NoMethodError,
"You specified #{@_layout.inspect} as the layout, but no such method was found"
end
if require_layout && _action_has_layout? && !layout_name
if require_layout && action_has_layout? && !layout_name
raise ArgumentError,
"There was no default layout for #{self.class} in #{view_paths.inspect}"
end
@ -354,7 +354,7 @@ module AbstractController
(options.keys & [:text, :inline, :partial]).empty? || options.key?(:layout)
end
def _action_has_layout?
def action_has_layout?
true
end
end