@@ -98,21 +98,21 @@ module InheritViews alias_method :orig_find_template, :find_template # look for a parent template if a standard one can't be found - def find_template(template_path, format = nil) + def find_template(template_path, format = nil, html_fallback = true) super rescue ::ActionView::MissingTemplate find_parent_template(template_path, format) end # given a template_path and format, returns a parent template, or raise ActionView::MissingTemplate - def find_parent_template(template_path, format = nil) + def find_parent_template(template_path, format = nil, html_fallback = true) # first, we grab the inherit view paths that are 'above' the given template_path if inherit_view_paths.present? && (starting_path = inherit_view_paths.detect {|path| template_path.starts_with?("#{path}/")}) parent_paths = inherit_view_paths.slice(inherit_view_paths.index(starting_path)+1..-1) # then, search through each path, substituting the inherit view path, returning the first found parent_paths.each do |path| begin - return orig_find_template(template_path.sub(/^#{starting_path}/, path), format) + return orig_find_template(template_path.sub(/^#{starting_path}/, path), format, html_fallback) rescue ::ActionView::MissingTemplate next end lib/inherit_views.rb d657aa3bd8e5ab2f6c9e94165c6c4e792a0b3456 Ian White ian.w.white@gmail.com http://github.com/ianwhite/inherit_views/commit/6bbd8e552ea13e72698b7e3bb24c9bc4dc84a36e 6bbd8e552ea13e72698b7e3bb24c9bc4dc84a36e 2009-03-03T01:29:09-08:00 2009-03-03T01:29:09-08:00 Update method signature of find_template to match current rails edge (2.3) 4e20c71ad8a2d936fc4d039c0b862e7397a47dc0 Ian White ian.w.white@gmail.com