Changeset 3316

Timestamp:

12/17/05 06:38:06 (3 years ago)

Author:

marcel

Message:

Don't include a layout when rendering an rjs template using render's :template option.

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/base.rb (modified) (1 diff)
• trunk/actionpack/lib/action_controller/layout.rb (modified) (1 diff)
• trunk/actionpack/test/controller/new_render_test.rb (modified) (1 diff)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Don't include a layout when rendering an rjs template using render's :template option. [Marcel Molina Jr.]
-
-* Update to script.aculo.us 1.5.0 final (equals 1.5.0_rc6) [Thomas Fuchs]

trunk/actionpack/lib/action_controller/base.rb

@@ -938 +938 @@
-
-      def default_template_name(default_action_name = action_name)
+        default_action_name = default_action_name.dup
+        strip_out_controller!(default_action_name) if template_path_includes_controller?(default_action_name)
-        "#{self.class.controller_path}/#{default_action_name}"
+      end
+      
+      def strip_out_controller!(path)
+        path.replace path.split('/', 2).last
+      end
+      
+      def template_path_includes_controller?(path)
+        path.to_s['/'] && self.class.controller_path.split('/')[-1] == path.split('/')[0]
-      end
-  end

trunk/actionpack/lib/action_controller/layout.rb

@@ -238 +238 @@
-        (options.has_key?(:layout) && options[:layout] != false) || 
-        options.values_at(:text, :file, :inline, :partial, :nothing).compact.empty? &&
-
+ || options[:template]
-      end
-

trunk/actionpack/test/controller/new_render_test.rb

@@ -210 +210 @@
-             "accessing_params_in_template_with_layout",
-             "render_with_explicit_template",
-
+
+
+
+
-          "layouts/standard"
-        when "builder_layout_test"