diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-09-15 18:09:39 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-09-15 18:09:39 +0200 |
| commit | 66ca68732431dd6bfc3c6df1fe17ef6fab98da40 (patch) | |
| tree | dc6ad0715b030fadddc5ed502aac9ba01a58a1b4 /addons/web/static/src/js/fields/upgrade_fields.js | |
| parent | 6aebc800538b6fabd79c6cd1e819ef6d961e7589 (diff) | |
| parent | ed901bedcb7c8b840ae5cf4731b946e998b8b141 (diff) | |
[MERGE] forward port branch saas-17 up to ed901bedcb7
Diffstat (limited to 'addons/web/static/src/js/fields/upgrade_fields.js')
| -rw-r--r-- | addons/web/static/src/js/fields/upgrade_fields.js | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/addons/web/static/src/js/fields/upgrade_fields.js b/addons/web/static/src/js/fields/upgrade_fields.js index 4c3b26b9802..9d61036ab8b 100644 --- a/addons/web/static/src/js/fields/upgrade_fields.js +++ b/addons/web/static/src/js/fields/upgrade_fields.js @@ -52,9 +52,9 @@ var AbstractFieldUpgrade = { * * @abstract * @private - * @param {JQuery} the 'Enterprise' label to insert + * @param {jQuery} $enterpriseLabel the 'Enterprise' label to insert */ - _insertEnterpriseLabel: function ($enterprise_label) {}, + _insertEnterpriseLabel: function ($enterpriseLabel) {}, /** * Opens the Upgrade dialog. * @@ -127,6 +127,15 @@ var UpgradeBoolean = FieldBoolean.extend(AbstractFieldUpgrade, { events: _.extend({}, AbstractField.prototype.events, { 'click input': '_onInputClicked', }), + /** + * Re-renders the widget with the label + * + * @param {jQuery} $label + */ + renderWithLabel: function ($label) { + this.$label = $label; + this._render(); + }, //-------------------------------------------------------------------------- // Private @@ -136,8 +145,9 @@ var UpgradeBoolean = FieldBoolean.extend(AbstractFieldUpgrade, { * @override * @private */ - _insertEnterpriseLabel: function ($enterprise_label) { - this.$el.append(' ').append($enterprise_label); + _insertEnterpriseLabel: function ($enterpriseLabel) { + var $el = this.$label || this.$el; + $el.append(' ').append($enterpriseLabel); }, /** * @override @@ -170,8 +180,8 @@ var UpgradeRadio = FieldRadio.extend(AbstractFieldUpgrade, { * @override * @private */ - _insertEnterpriseLabel: function ($enterprise_label) { - this.$('label').last().append(' ').append($enterprise_label); + _insertEnterpriseLabel: function ($enterpriseLabel) { + this.$('label').last().append(' ').append($enterpriseLabel); }, /** * @override |