diff options
| author | Julien Mougenot <jum@odoo.com> | 2020-06-12 09:01:44 +0000 |
|---|---|---|
| committer | Julien Mougenot <jum@odoo.com> | 2020-06-12 09:01:50 +0000 |
| commit | c4786fccfd23360a02e442c48ae2fb9f1e70aa4c (patch) | |
| tree | 95434422bfecf324a2112fadfc078a9bced134e7 /addons/web/static | |
| parent | d093fd4236a7c7f18645a85970cbdda6fec44c92 (diff) | |
[IMP] *: update notifications to optional title
closes odoo/odoo#52826
Related: odoo/enterprise#11084
Signed-off-by: Aaron Bohy (aab) <aab@odoo.com>
Diffstat (limited to 'addons/web/static')
17 files changed, 31 insertions, 31 deletions
diff --git a/addons/web/static/src/js/chrome/action_manager.js b/addons/web/static/src/js/chrome/action_manager.js index 7c6193be6cb..aee954342fa 100644 --- a/addons/web/static/src/js/chrome/action_manager.js +++ b/addons/web/static/src/js/chrome/action_manager.js @@ -536,7 +536,7 @@ var ActionManager = Widget.extend({ var message = _t('A popup window has been blocked. You ' + 'may need to change your browser settings to allow ' + 'popup windows for this page.'); - this.do_warn(_t('Warning'), message, true); + this.do_warn(false, message, true); } } diff --git a/addons/web/static/src/js/control_panel/custom_favorite_item.js b/addons/web/static/src/js/control_panel/custom_favorite_item.js index 75eefe9cc2f..b7b3a34ef81 100644 --- a/addons/web/static/src/js/control_panel/custom_favorite_item.js +++ b/addons/web/static/src/js/control_panel/custom_favorite_item.js @@ -60,7 +60,6 @@ odoo.define('web.CustomFavoriteItem', function (require) { _saveFavorite() { if (!this.state.description.length) { this.env.services.notification.notify({ - title: this.env._t("Error"), message: this.env._t("A name for your favorite filter is required."), type: 'danger', }); @@ -69,7 +68,6 @@ odoo.define('web.CustomFavoriteItem', function (require) { const favorites = this.model.getFiltersOfType('favorite'); if (favorites.some(f => f.description === this.state.description)) { this.env.services.notification.notify({ - title: this.env._t("Error"), message: this.env._t("Filter with same name already exists."), type: 'danger', }); diff --git a/addons/web/static/src/js/fields/basic_fields.js b/addons/web/static/src/js/fields/basic_fields.js index 9c04679a0d2..553a79cad20 100644 --- a/addons/web/static/src/js/fields/basic_fields.js +++ b/addons/web/static/src/js/fields/basic_fields.js @@ -1680,7 +1680,7 @@ var AbstractFieldBinary = AbstractField.extend({ }, on_file_uploaded: function (size, name) { if (size === false) { - this.do_warn(_t("File Upload"), _t("There was a problem while uploading your file")); + this.do_warn(false, _t("There was a problem while uploading your file")); // TODO: use crashmanager console.warn("Error while uploading file : ", name); } else { @@ -1823,7 +1823,7 @@ var FieldBinaryImage = AbstractFieldBinary.extend({ $img.one('error', function () { $img.attr('src', self.placeholder); - self.do_warn(_t("Image"), _t("Could not display the selected image.")); + self.do_warn(false, _t("Could not display the selected image")); }); return this._super.apply(this, arguments); @@ -1963,7 +1963,7 @@ var FieldBinaryFile = AbstractFieldBinary.extend({ }, on_save_as: function (ev) { if (!this.value) { - this.do_warn(_t("Save As..."), _t("The field is empty, there's nothing to save !")); + this.do_warn(false, _t("The field is empty, there's nothing to save.")); ev.stopPropagation(); } else if (this.res_id) { framework.blockUI(); @@ -2643,7 +2643,7 @@ var FieldProgressBar = AbstractField.extend({ // Cover all numbers with parseFloat parsedValue = field_utils.parse.float($input.val()); } catch (error) { - this.do_warn(_t("Wrong value entered!"), _t("Only Integer or Float Value should be valid.")); + this.do_warn(false, _t("Please enter a numerical value")); } if (parsedValue !== undefined) { diff --git a/addons/web/static/src/js/fields/relational_fields.js b/addons/web/static/src/js/fields/relational_fields.js index 660d6e43a7f..5c557dca239 100644 --- a/addons/web/static/src/js/fields/relational_fields.js +++ b/addons/web/static/src/js/fields/relational_fields.js @@ -1793,7 +1793,7 @@ var One2ManyKanbanRecord = KanbanRecord.extend({ if ($button.attr('warn')) { $button.on('click', function (e) { e.stopPropagation(); - self.do_warn(_t('Warning'), _t('Please click on the "save" button first.')); + self.do_warn(false, _t('Please click on the "save" button first')); }); } else { $button.attr('disabled', 'disabled'); diff --git a/addons/web/static/src/js/fields/signature.js b/addons/web/static/src/js/fields/signature.js index 98911f76155..de70f72c3e9 100644 --- a/addons/web/static/src/js/fields/signature.js +++ b/addons/web/static/src/js/fields/signature.js @@ -110,7 +110,7 @@ var FieldBinarySignature = AbstractFieldBinary.extend({ $img.on('error', function () { self._clearFile(); $img.attr('src', self.placeholder); - self.do_warn(_t("Image"), _t("Could not display the selected image.")); + self.do_warn(false, _t("Could not display the selected image")); }); }, diff --git a/addons/web/static/src/js/views/basic/basic_controller.js b/addons/web/static/src/js/views/basic/basic_controller.js index 6434554d376..99da98f4301 100644 --- a/addons/web/static/src/js/views/basic/basic_controller.js +++ b/addons/web/static/src/js/views/basic/basic_controller.js @@ -526,7 +526,7 @@ var BasicController = AbstractController.extend(FieldManagerMixin, { }); warnings.unshift('<ul>'); warnings.push('</ul>'); - this.do_warn(_t("The following fields are invalid:"), warnings.join('')); + this.do_warn(_t("Invalid fields:"), warnings.join('')); }, /** * Hook method, called when record(s) has been deleted. diff --git a/addons/web/static/src/js/views/calendar/calendar_quick_create.js b/addons/web/static/src/js/views/calendar/calendar_quick_create.js index e89881d0e93..0f6f8bd6873 100644 --- a/addons/web/static/src/js/views/calendar/calendar_quick_create.js +++ b/addons/web/static/src/js/views/calendar/calendar_quick_create.js @@ -80,7 +80,7 @@ var QuickCreate = Dialog.extend({ if (!val) { this.$('label, input').addClass('o_field_invalid'); var warnings = _.str.sprintf('<ul><li>%s</li></ul>', _t("Summary")); - this.do_warn(_t("The following field is invalid:"), warnings); + this.do_warn(_t("Invalid fields:"), warnings); } dataCalendar.title = val; return (val)? this.trigger_up('quickCreate', {data: dataCalendar, options: this.options}) : false; diff --git a/addons/web/static/src/js/views/file_upload_progress_bar.js b/addons/web/static/src/js/views/file_upload_progress_bar.js index 7eea38dd8f6..6c938e2de74 100644 --- a/addons/web/static/src/js/views/file_upload_progress_bar.js +++ b/addons/web/static/src/js/views/file_upload_progress_bar.js @@ -31,7 +31,7 @@ const ProgressBar = Widget.extend({ * @return {Promise} */ start() { - this.xhr.onabort = () => this.do_notify(_t("Upload canceled")); + this.xhr.onabort = () => this.do_notify(false, _t("Upload cancelled")); return this._super(...arguments); }, diff --git a/addons/web/static/src/js/views/kanban/kanban_record.js b/addons/web/static/src/js/views/kanban/kanban_record.js index 52ff0365518..f6216171f12 100644 --- a/addons/web/static/src/js/views/kanban/kanban_record.js +++ b/addons/web/static/src/js/views/kanban/kanban_record.js @@ -706,7 +706,7 @@ var KanbanRecord = Widget.extend({ } break; default: - this.do_warn("Kanban: no action for type : " + type); + this.do_warn(false, _t("Kanban: no action for type: ") + type); } }, /** 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 800a09f32be..709deced4df 100644 --- a/addons/web/static/src/js/views/list/list_controller.js +++ b/addons/web/static/src/js/views/list/list_controller.js @@ -287,10 +287,10 @@ var ListController = BasicController.extend({ }); if (resIds.length === session.active_ids_limit) { const msg = _.str.sprintf( - _t("Of the %d records selected, only the first %d have been deleted."), - state.count, resIds.length + _t("Only the first %d records have been deleted (out of %d selected)"), + resIds.length, state.count ); - this.do_notify(_t('Warning'), msg); + this.do_notify(false, msg); } this.reload(); }; diff --git a/addons/web/static/src/js/views/list/list_renderer.js b/addons/web/static/src/js/views/list/list_renderer.js index 5fb716e48dc..c2c57250022 100644 --- a/addons/web/static/src/js/views/list/list_renderer.js +++ b/addons/web/static/src/js/views/list/list_renderer.js @@ -586,7 +586,7 @@ var ListRenderer = BasicRenderer.extend({ if (node.attrs.options.warn) { $button.on("click", function (e) { e.stopPropagation(); - self.do_warn(_t("Warning"), _t('Please click on the "save" button first.')); + self.do_warn(false, _t('Please click on the "save" button first')); }); } else { $button.prop('disabled', true); diff --git a/addons/web/static/src/js/widgets/attach_document.js b/addons/web/static/src/js/widgets/attach_document.js index a4a72a62765..8ad48882ac2 100644 --- a/addons/web/static/src/js/widgets/attach_document.js +++ b/addons/web/static/src/js/widgets/attach_document.js @@ -62,7 +62,7 @@ var AttachDocument = Widget.extend({ }); warnings.unshift('<ul>'); warnings.push('</ul>'); - this.do_warn(_t("The following fields are invalid:"), warnings.join('')); + this.do_warn(_t("Invalid fields:"), warnings.join('')); }, //-------------------------------------------------------------------------- @@ -87,7 +87,7 @@ var AttachDocument = Widget.extend({ // but due to this security restriction give warning to save record first. // https://stackoverflow.com/questions/29728705/trigger-click-on-input-file-on-asynchronous-ajax-done/29873845#29873845 if (!this.res_id) { - return this.do_warn(_t('Warning : You have to save first before attaching a file.')); + return this.do_warn(false, _t('Please save before attaching a file')); } this.$('input.o_input_file').trigger('click'); }, diff --git a/addons/web/static/src/js/widgets/domain_selector.js b/addons/web/static/src/js/widgets/domain_selector.js index 755ee32979e..9fe71ce163f 100644 --- a/addons/web/static/src/js/widgets/domain_selector.js +++ b/addons/web/static/src/js/widgets/domain_selector.js @@ -535,10 +535,7 @@ var DomainSelector = DomainTree.extend({ // Warn the user if the domain is not valid after rendering if (!this._isValid) { - this.do_warn( - _t("Domain error"), - _t("The domain you entered is not properly formed") - ); + this.do_warn(false, _t("Domain not supported")); } }, /** @@ -583,7 +580,7 @@ var DomainSelector = DomainTree.extend({ try { domain = Domain.prototype.stringToArray($(e.currentTarget).val()); } catch (err) { // If there is a syntax error, just ignore the change - this.do_warn(_t("Syntax error"), _t("The domain you entered is not properly formed")); + this.do_warn(_t("Syntax error"), _t("Domain not properly formed")); return; } this._redraw(domain).then((function () { diff --git a/addons/web/static/src/js/widgets/model_field_selector.js b/addons/web/static/src/js/widgets/model_field_selector.js index 8f560be6d39..1856bccfade 100644 --- a/addons/web/static/src/js/widgets/model_field_selector.js +++ b/addons/web/static/src/js/widgets/model_field_selector.js @@ -433,8 +433,8 @@ var ModelFieldSelector = Widget.extend({ if (!this.valid) { this.do_warn( - _t("Invalid field chain"), - _t("The field chain is not valid. Did you maybe use a non-existing field name or followed a non-relational field?") + false, + _t("Invalid field chain. You may have used a non-existing field name or followed a non-relational field.") ); } }, @@ -495,7 +495,10 @@ var ModelFieldSelector = Widget.extend({ var userChainStr = this.$input.val(); var userChain = userChainStr.split("."); if (!this.options.followRelations && userChain.length > 1) { - this.do_warn(_t("Relation not allowed"), _t("You cannot follow relations for this field chain construction")); + this.do_warn( + _t("Relation not allowed"), + _t("You cannot follow relations for this field chain construction") + ); userChain = [userChain[0]]; } this.setChain(userChain).then((function () { diff --git a/addons/web/static/tests/control_panel/favorite_menu_tests.js b/addons/web/static/tests/control_panel/favorite_menu_tests.js index 905b3758859..9c404d0eb17 100644 --- a/addons/web/static/tests/control_panel/favorite_menu_tests.js +++ b/addons/web/static/tests/control_panel/favorite_menu_tests.js @@ -453,7 +453,6 @@ odoo.define('web.favorite_menu_tests', function (require) { notification: { notify: function (params) { assert.deepEqual(params, { - title: "Error", message: "Filter with same name already exists.", type: "danger" }); @@ -578,4 +577,4 @@ odoo.define('web.favorite_menu_tests', function (require) { form.destroy(); }); }); -});
\ No newline at end of file +}); diff --git a/addons/web/static/tests/fields/basic_fields_tests.js b/addons/web/static/tests/fields/basic_fields_tests.js index ec4b1b3f552..7af27167e4c 100644 --- a/addons/web/static/tests/fields/basic_fields_tests.js +++ b/addons/web/static/tests/fields/basic_fields_tests.js @@ -7236,7 +7236,10 @@ QUnit.module('basic_fields', { call_service: function (ev) { if (ev.data.service === 'notification') { assert.strictEqual(ev.data.method, 'notify'); - assert.strictEqual(ev.data.args[0].title, 'Wrong value entered!'); + assert.strictEqual( + ev.data.args[0].message, + "Please enter a numerical value" + ); } } }, diff --git a/addons/web/static/tests/views/form_tests.js b/addons/web/static/tests/views/form_tests.js index 3472c76aae8..33bc3de7347 100644 --- a/addons/web/static/tests/views/form_tests.js +++ b/addons/web/static/tests/views/form_tests.js @@ -3095,7 +3095,7 @@ QUnit.module('Views', { if (params.type !== 'danger') { return; } - assert.strictEqual(params.title, 'The following fields are invalid:', + assert.strictEqual(params.title, 'Invalid fields:', "should have a warning with correct title"); assert.strictEqual(params.message, '<ul><li>Foo</li></ul>', "should have a warning with correct message"); |
