diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-05-28 15:36:23 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-05-28 15:52:00 +0200 |
| commit | cffd147cfd4767f57dc6deeb0a956361904e1b1b (patch) | |
| tree | 8a5990635ca60e0f34fc59462ed694847714db5b /addons/web/static/src/js | |
| parent | e9350993ca0b81df17308766d7e26d458bc39520 (diff) | |
| parent | a20a31486cd0b99755f8e6c27281ac6ba4758b7a (diff) | |
[MERGE] forward port branch 11.0 up to a20a31486cd
Diffstat (limited to 'addons/web/static/src/js')
| -rw-r--r-- | addons/web/static/src/js/core/ajax.js | 8 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/calendar/calendar_controller.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/list/list_controller.js | 5 |
3 files changed, 11 insertions, 4 deletions
diff --git a/addons/web/static/src/js/core/ajax.js b/addons/web/static/src/js/core/ajax.js index f1f73bb5a28..cbd02e0755e 100644 --- a/addons/web/static/src/js/core/ajax.js +++ b/addons/web/static/src/js/core/ajax.js @@ -22,7 +22,13 @@ function genericJsonRpc (fct_name, params, settings, fct) { core.bus.trigger('rpc:result', data, result); if (result.error !== undefined) { if (result.error.data.arguments[0] !== "bus.Bus not available in test mode") { - console.error("Server application error", JSON.stringify(result.error)); + console.error( + "Server application error\n", + "Error code:", result.error.code, "\n", + "Error message:", result.error.message, "\n", + "Error data message:\n", result.error.data.message, "\n", + "Error data debug:\n", result.error.data.debug + ); } return $.Deferred().reject("server", result.error); } else { diff --git a/addons/web/static/src/js/views/calendar/calendar_controller.js b/addons/web/static/src/js/views/calendar/calendar_controller.js index d49c7c33f5c..4525a739df9 100644 --- a/addons/web/static/src/js/views/calendar/calendar_controller.js +++ b/addons/web/static/src/js/views/calendar/calendar_controller.js @@ -156,7 +156,7 @@ var CalendarController = AbstractController.extend({ * @returns {Deferred} */ _updateRecord: function (record) { - return this.model.updateRecord(record).then(this.reload.bind(this)); + return this.model.updateRecord(record).always(this.reload.bind(this)); }, //-------------------------------------------------------------------------- diff --git a/addons/web/static/src/js/views/list/list_controller.js b/addons/web/static/src/js/views/list/list_controller.js index 459f3db56ff..96a13c90b11 100644 --- a/addons/web/static/src/js/views/list/list_controller.js +++ b/addons/web/static/src/js/views/list/list_controller.js @@ -361,8 +361,9 @@ var ListController = BasicController.extend({ * @returns {Deferred} */ _update: function () { - this._toggleSidebar(); - return this._super.apply(this, arguments); + return this._super.apply(this, arguments) + .then(this._toggleSidebar.bind(this)) + .then(this._updateButtons.bind(this, 'readonly')); }, /** * This helper simply makes sure that the control panel buttons matches the |