mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Don't assume ActiveRecord is available
This commit is contained in:
parent
2ecc678ed6
commit
2259ecf368
1 changed files with 13 additions and 8 deletions
|
@ -187,15 +187,20 @@ module ActionView
|
|||
builder_partial_path = partial_path.class.to_s.demodulize.underscore.sub(/_builder$/, '')
|
||||
local_assigns.merge!(builder_partial_path.to_sym => partial_path)
|
||||
render_partial(:partial => builder_partial_path, :object => options[:object], :locals => local_assigns)
|
||||
when Array, ActiveRecord::Associations::AssociationCollection, ActiveRecord::NamedScope::Scope
|
||||
render_partial_collection(options.except(:partial).merge(:collection => partial_path))
|
||||
else
|
||||
object = partial_path
|
||||
render_partial(
|
||||
:partial => ActionController::RecordIdentifier.partial_path(object, controller.class.controller_path),
|
||||
:object => object,
|
||||
:locals => local_assigns
|
||||
)
|
||||
if Array === partial_path ||
|
||||
(defined?(ActiveRecord) &&
|
||||
(ActiveRecord::Associations::AssociationCollection === partial_path ||
|
||||
ActiveRecord::NamedScope::Scope === partial_path))
|
||||
render_partial_collection(options.except(:partial).merge(:collection => partial_path))
|
||||
else
|
||||
object = partial_path
|
||||
render_partial(
|
||||
:partial => ActionController::RecordIdentifier.partial_path(object, controller.class.controller_path),
|
||||
:object => object,
|
||||
:locals => local_assigns
|
||||
)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue