frontends/default/views/_add_existing_form.rhtml frontends/default/views/_create_form.rhtml frontends/default/views/_field_search.rhtml frontends/default/views/_form.rhtml frontends/default/views/_form_association.rhtml frontends/default/views/_form_association_footer.rhtml frontends/default/views/_form_association_header.rhtml frontends/default/views/_form_association_record.rhtml frontends/default/views/_form_attribute.rhtml frontends/default/views/_form_hidden_attribute.rhtml frontends/default/views/_form_messages.rhtml frontends/default/views/_list.rhtml frontends/default/views/_list_actions.rhtml frontends/default/views/_list_calculations.rhtml frontends/default/views/_list_column_headings.rhtml frontends/default/views/_list_header.rhtml frontends/default/views/_list_inline_adapter.rhtml frontends/default/views/_list_pagination_links.rhtml frontends/default/views/_list_record.rhtml frontends/default/views/_live_search.rhtml frontends/default/views/_messages.rhtml frontends/default/views/_nested.rhtml frontends/default/views/_search.rhtml frontends/default/views/_show.rhtml frontends/default/views/_show_columns.rhtml frontends/default/views/_update_form.rhtml frontends/default/views/add_existing.rjs frontends/default/views/add_existing_form.rhtml frontends/default/views/create.rjs frontends/default/views/create_form.rhtml frontends/default/views/delete.rhtml frontends/default/views/destroy.rjs frontends/default/views/edit_associated.rjs frontends/default/views/field_search.rhtml frontends/default/views/form_messages.rjs frontends/default/views/list.rhtml frontends/default/views/search.rhtml frontends/default/views/show.rhtml frontends/default/views/update.rjs frontends/default/views/update_column.rjs frontends/default/views/update_form.rhtml @@ -4,10 +4,10 @@ require 'exceptions' ## version = Rails::VERSION::STRING.split(".") -if version[0] < "2" +if version[0] < "1" or (version[0] == "1" and version[1] < "2") message = <<-EOM ************************************************************************ - Rails 2.0 or greater is required. Please remove ActiveScaffold or + Rails 1.2.1 or greater is required. Please remove ActiveScaffold or upgrade Rails. After you upgrade Rails, be sure to run > rake rails:update:javascripts environment.rb @@ -53,15 +53,25 @@ module ActiveScaffold # defines the attribute read methods on the model, so record.send() doesn't find protected/private methods instead klass = self.active_scaffold_config.model - klass.define_attribute_methods unless klass.generated_methods? + if klass.respond_to? :generated_methods? + # edge rails (2.0) + klass.define_attribute_methods unless klass.generated_methods? + else + # stable rails (1.2.3) + # NOTE define_read_methods is an *instance* method even though it adds methods to the *class*. + klass.new.send(:define_read_methods) if klass.read_methods.empty? && klass.generate_read_methods + end - frontends_path = File.join(RAILS_ROOT, 'vendor', 'plugins', ActiveScaffold::Config::Core.plugin_directory, 'frontends') + # set up the generic_view_paths (Rails 2.x) + if method_defined? :generic_view_paths + frontends_path = File.join(RAILS_ROOT, 'vendor', 'plugins', ActiveScaffold::Config::Core.plugin_directory, 'frontends') - paths = self.active_scaffold_config.inherited_view_paths.clone - paths << File.join(RAILS_ROOT, 'app', 'views', 'active_scaffold_overrides') - paths << File.join(frontends_path, active_scaffold_config.frontend, 'views') if active_scaffold_config.frontend.to_sym != :default - paths << File.join(frontends_path, 'default', 'views') - self.generic_view_paths = paths + paths = self.active_scaffold_config.inherited_view_paths.clone + paths << File.join(RAILS_ROOT, 'app', 'views', 'active_scaffold_overrides') + paths << File.join(frontends_path, active_scaffold_config.frontend, 'views') if active_scaffold_config.frontend.to_sym != :default + paths << File.join(frontends_path, 'default', 'views') + self.generic_view_paths = paths + end # include the rest of the code into the controller: the action core and the included actions module_eval do lib/active_scaffold.rb @@ -16,6 +16,20 @@ module ActionController #:nodoc: alias_method :render_without_active_scaffold, :render alias_method :render, :render_with_active_scaffold + # Rails 1.2.x + if method_defined? :render_action + def render_action_with_active_scaffold(action_name, status = nil, with_layout = true) #:nodoc: + if self.class.uses_active_scaffold? + path = rewrite_template_path_for_active_scaffold(action_name) + return render(:template => path, :layout => with_layout, :status => status) if path != action_name + end + return render_action_without_active_scaffold(action_name, status, with_layout) + end + alias_method :render_action_without_active_scaffold, :render_action + alias_method :render_action, :render_action_with_active_scaffold + end + # Rails 2.x implementation is post-initialization on :active_scaffold method + private def rewrite_template_path_for_active_scaffold(path) lib/extensions/action_controller_rendering.rb @@ -72,12 +72,6 @@ module ActionView #:nodoc: alias_method :render_partial_without_active_scaffold, :render_partial alias_method :render_partial, :render_partial_with_active_scaffold - def template_format - #return @template_format if @template_format <-- I COMMENTED THIS OUT - format = controller && controller.respond_to?(:request) && controller.request.parameters[:format] - @template_format = format.blank? ? :html : format.to_sym - end - private def rewrite_partial_path_for_active_scaffold(partial_path) lib/extensions/action_view_rendering.rb @@ -1,4 +1,4 @@ -# The view_paths functionality in Rails 2.0.x doesn't support +# The view_paths functionality in Edge Rails (Rails 2.0) doesn't support # the idea of a fallback generic template file, such as what make ActiveScaffold # work. This patch adds generic_view_paths, which are folders containing templates # that may apply to all controllers. @@ -8,6 +8,9 @@ # This is in contrast to how Rails will normally bypass the controller if it sees # a partial. +# if render_action exists, we can use our existing hooks. +unless ActionController::Base.method_defined? :render_action + class ActionController::Base class_inheritable_accessor :generic_view_paths self.generic_view_paths = [] @@ -39,4 +42,6 @@ class ActionView::Base def search_generic_view_paths? controller.respond_to?(:generic_view_paths) and controller.class.action_methods.include?(controller.action_name) end +end + end \ No newline at end of file lib/extensions/generic_view_paths.rb frontends/default/views/_add_existing_form.html.erb frontends/default/views/_create_form.html.erb frontends/default/views/_field_search.html.erb frontends/default/views/_form.html.erb frontends/default/views/_form_association.html.erb frontends/default/views/_form_association_footer.html.erb frontends/default/views/_form_association_header.html.erb frontends/default/views/_form_association_record.html.erb frontends/default/views/_form_attribute.html.erb frontends/default/views/_form_hidden_attribute.html.erb frontends/default/views/_form_messages.html.erb frontends/default/views/_list.html.erb frontends/default/views/_list_actions.html.erb frontends/default/views/_list_calculations.html.erb frontends/default/views/_list_column_headings.html.erb frontends/default/views/_list_header.html.erb frontends/default/views/_list_inline_adapter.html.erb frontends/default/views/_list_pagination_links.html.erb frontends/default/views/_list_record.html.erb frontends/default/views/_live_search.html.erb frontends/default/views/_messages.html.erb frontends/default/views/_nested.html.erb frontends/default/views/_search.html.erb frontends/default/views/_show.html.erb frontends/default/views/_show_columns.html.erb frontends/default/views/_update_form.html.erb frontends/default/views/add_existing.rjs.erb frontends/default/views/add_existing_form.html.erb frontends/default/views/create.rjs.erb frontends/default/views/create_form.html.erb frontends/default/views/delete.html.erb frontends/default/views/destroy.rjs.erb frontends/default/views/edit_associated.rjs.erb frontends/default/views/field_search.html.erb frontends/default/views/form_messages.rjs.erb frontends/default/views/list.html.erb frontends/default/views/search.html.erb frontends/default/views/show.html.erb frontends/default/views/update.rjs.erb frontends/default/views/update_column.rjs.erb frontends/default/views/update_form.html.erb d14c7ce577e0f0be0dd5ce896299cb5fb15f620b edwin.moss edwin.moss@561dde7e-7729-0410-be8e-ef83869d6c7d http://github.com/relevance/active_scaffold/commit/e7c593a8e4659727afb6743c7e381d50d2443d99 e7c593a8e4659727afb6743c7e381d50d2443d99 2008-03-29T15:21:22-07:00 2008-03-29T15:21:22-07:00 Not yet ready for this big step to Rails 2.0. git-svn-id: http://activescaffold.googlecode.com/svn/trunk@738 561dde7e-7729-0410-be8e-ef83869d6c7d 150a178ed316f73075a08e70e6abf3f8116cd8bd edwin.moss edwin.moss@561dde7e-7729-0410-be8e-ef83869d6c7d