From 79cf08eecf2da14a78bf49e203fc8dcdb790bfed Mon Sep 17 00:00:00 2001 From: Thomas Kluyver Date: Fri, 8 May 2015 11:15:41 -0700 Subject: [PATCH 1/2] Set contentType to JSON when sending session models Closes ipython/ipython#8416 --- jupyter_notebook/static/services/sessions/session.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jupyter_notebook/static/services/sessions/session.js b/jupyter_notebook/static/services/sessions/session.js index 923558df6e..8eeaaf21c7 100644 --- a/jupyter_notebook/static/services/sessions/session.js +++ b/jupyter_notebook/static/services/sessions/session.js @@ -121,6 +121,7 @@ define([ cache: false, type: "POST", data: JSON.stringify(this._get_model()), + contentType: 'application/json', dataType: "json", success: this._on_success(on_success), error: this._on_error(on_error) @@ -168,6 +169,7 @@ define([ cache: false, type: "PATCH", data: JSON.stringify(this._get_model()), + contentType: 'application/json', dataType: "json", success: this._on_success(success), error: this._on_error(error) From cc003550a3f5f227bb781499932266aeee8b0870 Mon Sep 17 00:00:00 2001 From: Thomas Kluyver Date: Fri, 8 May 2015 11:41:53 -0700 Subject: [PATCH 2/2] Add some more missing contentType ajax parameters --- jupyter_notebook/static/services/contents.js | 4 ++++ jupyter_notebook/static/services/kernels/kernel.js | 3 +++ 2 files changed, 7 insertions(+) diff --git a/jupyter_notebook/static/services/contents.js b/jupyter_notebook/static/services/contents.js index b2b17b6a2f..3cfcf31a62 100644 --- a/jupyter_notebook/static/services/contents.js +++ b/jupyter_notebook/static/services/contents.js @@ -117,6 +117,7 @@ define(function(require) { processData : false, type : "POST", data: data, + contentType: 'application/json', dataType : "json", }; return utils.promising_ajax(this.api_url(path), settings); @@ -181,6 +182,7 @@ define(function(require) { processData : false, type: "POST", data: JSON.stringify({copy_from: from_file}), + contentType: 'application/json', dataType : "json", }; return utils.promising_ajax(url, settings); @@ -194,6 +196,7 @@ define(function(require) { var url = this.api_url(path, 'checkpoints'); var settings = { type : "POST", + contentType: false, // no data dataType : "json", }; return utils.promising_ajax(url, settings); @@ -213,6 +216,7 @@ define(function(require) { var url = this.api_url(path, 'checkpoints', checkpoint_id); var settings = { type : "POST", + contentType: false, // no data }; return utils.promising_ajax(url, settings); }; diff --git a/jupyter_notebook/static/services/kernels/kernel.js b/jupyter_notebook/static/services/kernels/kernel.js index 52279849b5..f91348e093 100644 --- a/jupyter_notebook/static/services/kernels/kernel.js +++ b/jupyter_notebook/static/services/kernels/kernel.js @@ -194,6 +194,7 @@ define([ cache: false, type: "POST", data: JSON.stringify({name: this.name}), + contentType: 'application/json', dataType: "json", success: this._on_success(on_success), error: this._on_error(error) @@ -276,6 +277,7 @@ define([ processData: false, cache: false, type: "POST", + contentType: false, // there's no data with this dataType: "json", success: this._on_success(on_success), error: this._on_error(error) @@ -317,6 +319,7 @@ define([ processData: false, cache: false, type: "POST", + contentType: false, // there's no data with this dataType: "json", success: this._on_success(on_success), error: this._on_error(on_error)