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

Make sure ActionView is loaded inorder to build view paths

This commit is contained in:
Joshua Peek 2008-08-06 17:40:03 -05:00
parent c6b7d0f344
commit f5bcbde1e3

View file

@ -340,9 +340,11 @@ Run `rake gems:install` to install the missing gems.
end end
def load_view_paths def load_view_paths
if configuration.frameworks.include?(:action_view)
ActionView::PathSet::Path.eager_load_templates! if configuration.cache_classes ActionView::PathSet::Path.eager_load_templates! if configuration.cache_classes
ActionMailer::Base.template_root.load if configuration.frameworks.include?(:action_mailer)
ActionController::Base.view_paths.load if configuration.frameworks.include?(:action_controller) ActionController::Base.view_paths.load if configuration.frameworks.include?(:action_controller)
ActionMailer::Base.template_root.load if configuration.frameworks.include?(:action_mailer)
end
end end
# Eager load application classes # Eager load application classes
@ -440,10 +442,12 @@ Run `rake gems:install` to install the missing gems.
# paths have already been set, it is not changed, otherwise it is # paths have already been set, it is not changed, otherwise it is
# set to use Configuration#view_path. # set to use Configuration#view_path.
def initialize_framework_views def initialize_framework_views
if configuration.frameworks.include?(:action_view)
view_path = ActionView::PathSet::Path.new(configuration.view_path, false) view_path = ActionView::PathSet::Path.new(configuration.view_path, false)
ActionMailer::Base.template_root ||= view_path if configuration.frameworks.include?(:action_mailer) ActionMailer::Base.template_root ||= view_path if configuration.frameworks.include?(:action_mailer)
ActionController::Base.view_paths = view_path if configuration.frameworks.include?(:action_controller) && ActionController::Base.view_paths.empty? ActionController::Base.view_paths = view_path if configuration.frameworks.include?(:action_controller) && ActionController::Base.view_paths.empty?
end end
end
# If Action Controller is not one of the loaded frameworks (Configuration#frameworks) # If Action Controller is not one of the loaded frameworks (Configuration#frameworks)
# this does nothing. Otherwise, it loads the routing definitions and sets up # this does nothing. Otherwise, it loads the routing definitions and sets up