[MERGE] forward port branch saas-16 up to c3a48da767
This commit is contained in:
@@ -2040,8 +2040,9 @@ var FieldDomain = AbstractField.extend({
|
||||
"click .o_field_domain_dialog_button": "_onDialogEditButtonClick",
|
||||
}),
|
||||
custom_events: _.extend({}, AbstractField.prototype.custom_events, {
|
||||
"domain_changed": "_onDomainSelectorValueChange",
|
||||
"domain_selected": "_onDomainSelectorDialogValueChange",
|
||||
domain_changed: "_onDomainSelectorValueChange",
|
||||
domain_selected: "_onDomainSelectorDialogValueChange",
|
||||
open_record: "_onOpenRecord",
|
||||
}),
|
||||
/**
|
||||
* @constructor
|
||||
@@ -2222,6 +2223,15 @@ var FieldDomain = AbstractField.extend({
|
||||
_onDomainSelectorDialogValueChange: function (e) {
|
||||
this._setValue(Domain.prototype.arrayToString(e.data.domain));
|
||||
},
|
||||
/**
|
||||
* Stops the propagation of the 'open_record' event, as we don't want the
|
||||
* user to be able to open records from the list opened in a dialog.
|
||||
*
|
||||
* @param {OdooEvent} event
|
||||
*/
|
||||
_onOpenRecord: function (event) {
|
||||
event.stopPropagation();
|
||||
},
|
||||
});
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user