diff options
author | Patrik Bóna <patrik.bona@mrhead.sk> | 2017-12-14 10:14:24 +0100 |
---|---|---|
committer | Patrik Bóna <patrik.bona@mrhead.sk> | 2018-09-27 10:59:56 +0200 |
commit | 8e07711d65a10be697020cc775e966bc2df87b7e (patch) | |
tree | 941719efc9bd4d13823de84f290e152727e2f877 /actionview/test/ujs/server.rb | |
parent | 8541394e71e961906daaea5961276892278c8a91 (diff) | |
download | rails-8e07711d65a10be697020cc775e966bc2df87b7e.tar.gz rails-8e07711d65a10be697020cc775e966bc2df87b7e.tar.bz2 rails-8e07711d65a10be697020cc775e966bc2df87b7e.zip |
Do not enable disabled elements for XHR redirects
Fixes #29473.
Diffstat (limited to 'actionview/test/ujs/server.rb')
-rw-r--r-- | actionview/test/ujs/server.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/actionview/test/ujs/server.rb b/actionview/test/ujs/server.rb index 48e9bcb65f..56f436c8b8 100644 --- a/actionview/test/ujs/server.rb +++ b/actionview/test/ujs/server.rb @@ -64,7 +64,12 @@ class TestsController < ActionController::Base if params[:content_type] && params[:content] render inline: params[:content], content_type: params[:content_type] elsif request.xhr? - render json: JSON.generate(data) + if params[:with_xhr_redirect] + response.set_header("X-Xhr-Redirect", "http://example.com/") + render inline: %{Turbolinks.clearCache()\nTurbolinks.visit("http://example.com/", {"action":"replace"})} + else + render json: JSON.generate(data) + end elsif params[:iframe] payload = JSON.generate(data).gsub("<", "<").gsub(">", ">") html = <<-HTML |