Changeset 3472

Timestamp:

01/23/06 16:29:37 (3 years ago)

Author:

sam

Message:

Fix render(:update) to not render layouts

Files:

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

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Fix render(:update) to not render layouts. [Sam Stephenson]
-
-* Fixed that SSL would not correctly be detected when running lighttpd/fcgi behind lighttpd w/mod_proxy #3548 [stephen_purcell@yahoo.com]

trunk/actionpack/lib/action_controller/layout.rb

@@ -237 +237 @@
-    private
-      def apply_layout?(template_with_options, options)
+        return false if options == :update
-        template_with_options ?  candidate_for_layout?(options) : !template_exempt_from_layout?
-      end

trunk/actionpack/test/controller/new_render_test.rb

@@ -224 +224 @@
-             "render_js_with_explicit_template",
-             "render_js_with_explicit_action_template",
-
+, "update_page"
-    
-          "layouts/standard"
@@ -490 +490 @@
-  def test_update_page
-    get :update_page
+    assert_template nil
-    assert_equal 'text/javascript', @response.headers['Content-type']
-    assert_equal 2, @response.body.split($/).length