pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] web: hide CopyClipboard widget button when pointless

Browse Source 
The widget has been moved in rev. odoo/odoo@15f3bbe but was not very generic.

In particular, there was a traceback when clicking on the button if the field
had no value (the button was displayed for readonly fields in create mode).

The button is now only appended in readonly mode (a `button` inside an `input`
or a `textarea` is not very DOM friendly) if the field has a value.

Task 1941996

closes odoo/odoo#31635

Signed-off-by: Aaron Bohy (aab) <aab@odoo.com>
This commit is contained in:
Martin Geubelle
2019-03-06 16:11:33 +00:00
parent a3489be331
commit dcf8c67fe3
3 changed files with 88 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/src/js/fields/basic_fields.js
+24 -31
View File
@@ -1331,7 +1331,9 @@ var CopyClipboard = {
*/
destroy: function () {
this._super.apply(this, arguments);
this.clipboard.destroy();
if (this.clipboard) {
this.clipboard.destroy();
}
},
//--------------------------------------------------------------------------
@@ -1346,8 +1348,8 @@ var CopyClipboard = {
var $clipboardBtn = this.$('.o_clipboard_button');
$clipboardBtn.tooltip({title: _t('Copied !'), trigger: 'manual', placement: 'right'});
this.clipboard = new ClipboardJS($clipboardBtn[0], {
text: function (_) {
return self.value.trim();
text: function () {
return self.value.trim();
},
// Container added because of Bootstrap modal that give the focus to another element.
// We need to give to correct focus to ClipboardJS (see in ClipboardJS doc)
@@ -1363,40 +1365,31 @@ var CopyClipboard = {
});
});
},
/**
* @override
*/
_render: function () {
this._super.apply(this, arguments);
this.$el.addClass('o_field_copy');
},
/**
* @override
*/
_renderReadonly: function () {
this._super.apply(this, arguments);
if (this.value) {
this.$el.append($(qweb.render(this.clipboardTemplate)));
this._initClipboard();
}
}
};
var TextCopyClipboard = FieldText.extend(CopyClipboard, {
//--------------------------------------------------------------------------
// Private
//--------------------------------------------------------------------------
/**
* @override
*/
_render: function() {
this._super.apply(this, arguments);
this.$el.addClass('o_field_copy');
this.$el.append($(qweb.render('CopyClipboardText')));
this._initClipboard();
}
clipboardTemplate: 'CopyClipboardText',
});
var CharCopyClipboard = FieldChar.extend(CopyClipboard, {
//--------------------------------------------------------------------------
// Private
//--------------------------------------------------------------------------
/**
* @override
*/
_render: function() {
this._super.apply(this, arguments);
this.$el.addClass('o_field_copy');
this.$el.append($(qweb.render('CopyClipboardChar')));
this._initClipboard();
}
clipboardTemplate: 'CopyClipboardChar',
});
var AbstractFieldBinary = AbstractField.extend({