Fix case when rendering a partial inside RJS with inherited layout [#…

…4786 state:resolved]
rails · Jun 7, 2010 · 981f812 · 981f812
1 parent 50031bf
commit 981f812
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
@@ -188,7 +188,7 @@ def with_layout_format
           begin
             yield
           ensure
-            _set_detail(:formats, formats)
+            _set_detail(:formats, old_formats)
           end
         end
       end

diff --git a/actionpack/test/controller/new_base/render_rjs_test.rb b/actionpack/test/controller/new_base/render_rjs_test.rb
@@ -2,7 +2,10 @@
 
 module RenderRjs
   class BasicController < ActionController::Base
+    layout "application", :only => :index_respond_to
+
     self.view_paths = [ActionView::FixtureResolver.new(
+      "layouts/application.html.erb"           => "",
       "render_rjs/basic/index.js.rjs"          => "page[:customer].replace_html render(:partial => 'customer')",
       "render_rjs/basic/index_html.js.rjs"     => "page[:customer].replace_html :partial => 'customer'",
       "render_rjs/basic/index_no_js.js.erb"    => "<%= render(:partial => 'developer') %>",