summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/views
diff options
context:
space:
mode:
authorqsm-odoo <qsm@odoo.com>2015-07-22 15:37:13 +0200
committerqsm-odoo <qsm@odoo.com>2015-07-23 10:51:12 +0200
commit86c399f3bde4efb271677914bc9f2721d77a681b (patch)
tree775660ba56c564478d9d9b93c307c498db7d4967 /addons/web/static/src/js/views
parent84197b51eeacb7228ea05eef946eba3f6f9725b2 (diff)
[IMP] web: New notification system
Backport of the Notification system
Diffstat (limited to 'addons/web/static/src/js/views')
-rw-r--r--addons/web/static/src/js/views/form_relational_widgets.js5
-rw-r--r--addons/web/static/src/js/views/form_widgets.js4
2 files changed, 4 insertions, 5 deletions
diff --git a/addons/web/static/src/js/views/form_relational_widgets.js b/addons/web/static/src/js/views/form_relational_widgets.js
index fb77d9feb3b..78224f4e9be 100644
--- a/addons/web/static/src/js/views/form_relational_widgets.js
+++ b/addons/web/static/src/js/views/form_relational_widgets.js
@@ -1111,9 +1111,8 @@ var One2ManyListView = X2ManyListView.extend({
},
do_button_action: function (name, id, callback) {
if (!_.isNumber(id)) {
- core.bus.trigger('display_notification_warning',
- _t("Action Button"),
- _t("The o2m record must be saved before an action can be used"));
+ this.do_warn(_t("Action Button"),
+ _t("The o2m record must be saved before an action can be used"));
return;
}
var parent_form = this.x2m.view;
diff --git a/addons/web/static/src/js/views/form_widgets.js b/addons/web/static/src/js/views/form_widgets.js
index 274d59b0ee3..e8b83aeb91e 100644
--- a/addons/web/static/src/js/views/form_widgets.js
+++ b/addons/web/static/src/js/views/form_widgets.js
@@ -1125,7 +1125,7 @@ var FieldBinary = common.AbstractField.extend(common.ReinitializeFieldMixin, {
var file = file_node.files[0];
if (file.size > this.max_upload_size) {
var msg = _t("The selected file exceed the maximum file size of %s.");
- core.bus.trigger('display_notification_warning', _t("File upload"), _.str.sprintf(msg, utils.human_size(this.max_upload_size)));
+ this.do_warn(_t("File upload"), _.str.sprintf(msg, utils.human_size(this.max_upload_size)));
return false;
}
var filereader = new FileReader();
@@ -1303,7 +1303,7 @@ var FieldBinaryImage = FieldBinary.extend({
});
$img.on('error', function() {
$img.attr('src', self.placeholder);
- core.bus.trigger('display_notification_warning', _t("Image"), _t("Could not display the selected image."));
+ self.do_warn(_t("Image"), _t("Could not display the selected image."));
});
},
on_file_uploaded_and_valid: function(size, name, content_type, file_base64) {