diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-06-14 15:20:01 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-06-14 15:20:01 +0200 |
| commit | 34a8754d4f0a6dca7cf612859d5702bcae1f90d6 (patch) | |
| tree | 757fd2bd012ff92968ea0cc0f27523fd0a1587cf /addons/web/static/src | |
| parent | 856685d6408857678ca9fc25b09dfea468800f93 (diff) | |
| parent | 498b4b4350d5fdeab0fb58275ad3b8e4dd443190 (diff) | |
[MERGE] forward port branch saas-12.2 up to 498b4b4350d
Diffstat (limited to 'addons/web/static/src')
4 files changed, 6 insertions, 4 deletions
diff --git a/addons/web/static/src/js/chrome/action_manager_act_window.js b/addons/web/static/src/js/chrome/action_manager_act_window.js index 5667e2d1441..28c7d96b5d8 100644 --- a/addons/web/static/src/js/chrome/action_manager_act_window.js +++ b/addons/web/static/src/js/chrome/action_manager_act_window.js @@ -372,7 +372,7 @@ ActionManager.include({ Widget: View, }); } else if (config.debug === 'assets') { - console.error("View type '" + viewType + "' is not present in the view registry."); + console.log("View type '" + viewType + "' is not present in the view registry."); } }); return views; diff --git a/addons/web/static/src/js/fields/basic_fields.js b/addons/web/static/src/js/fields/basic_fields.js index e546eb02be0..546831a11ce 100644 --- a/addons/web/static/src/js/fields/basic_fields.js +++ b/addons/web/static/src/js/fields/basic_fields.js @@ -1510,6 +1510,7 @@ var AbstractFieldBinary = AbstractField.extend({ */ _clearFile: function (){ var self = this; + this.$('.o_input_file').val(''); this.set_filename(''); if (!this.isDestroyed()) { this._setValue(false).then(function() { diff --git a/addons/web/static/src/js/views/qweb/qweb_view.js b/addons/web/static/src/js/views/qweb/qweb_view.js index 9e79ecf19d2..45c7340d5c1 100644 --- a/addons/web/static/src/js/views/qweb/qweb_view.js +++ b/addons/web/static/src/js/views/qweb/qweb_view.js @@ -65,8 +65,9 @@ var Model = AbstractModel.extend({ /** * reload */ - reload: function (_id, _params) { - // FIXME: update this._state or something? + reload: function (_id, params) { + _.extend(this._state, _.pick(params, ['domain', 'context'])); + return this._fetch(); } }); diff --git a/addons/web/static/src/scss/layout_boxed.scss b/addons/web/static/src/scss/layout_boxed.scss index 2129f583b21..bc4f5a6c2fb 100644 --- a/addons/web/static/src/scss/layout_boxed.scss +++ b/addons/web/static/src/scss/layout_boxed.scss @@ -1,5 +1,5 @@ .o_boxed_footer, .o_boxed_header, .o_report_layout_boxed { - font-family: 'Lato' 'Noto'; + font-family: 'Lato', 'Noto'; color: gray('700'); font-size: 12px; } |