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

[FIX] web_editor: restore linked date field edition

Browse Source 
4eafd78847 was not correctly adapted with new editor.
The `removeClass` and the css for that class was left in the code but the code
in charge of adding that class was just removed, breaking the behavior.

closes odoo/odoo#75786

X-original-commit: e59f91d74ad07430a4942efeeb479a538993c918
Signed-off-by: Antoine Guenet <Zinston@users.noreply.github.com>
Signed-off-by: Romain Derie <rdeodoo@users.noreply.github.com>
This commit is contained in:
Romain Derie
2021-08-31 18:48:54 +00:00
parent 92e70b8392
commit 34ea4030b1
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web_editor/static/src/js/wysiwyg/wysiwyg.js
+13 -3
View File
@@ -104,9 +104,16 @@ const Wysiwyg = Widget.extend({
function () {
self.odooEditor.observerUnactive();
const $field = $(this);
if (($field.data('oe-type') === "datetime" || $field.data('oe-type') === "date") && !$field.hasClass('o_editable_date_field_format_changed')) {
$field.text($field.data('oe-original-with-format'));
$field.addClass('o_editable_date_field_format_changed');
if (($field.data('oe-type') === "datetime" || $field.data('oe-type') === "date")) {
let selector = '[data-oe-id="' + $field.data('oe-id') + '"]';
selector += '[data-oe-field="' + $field.data('oe-field') + '"]';
selector += '[data-oe-model="' + $field.data('oe-model') + '"]';
const $linkedFieldNodes = self.$editable.find(selector).addBack(selector);
$linkedFieldNodes.addClass('o_editable_date_field_linked');
if (!$field.hasClass('o_editable_date_field_format_changed')) {
$linkedFieldNodes.text($field.data('oe-original-with-format'));
$linkedFieldNodes.addClass('o_editable_date_field_format_changed');
}
}
if ($field.data('oe-type') === "monetary") {
$field.attr('contenteditable', false);
@@ -1494,6 +1501,9 @@ const Wysiwyg = Widget.extend({
return new Promise(function () {});
},
_onDocumentMousedown: function (e) {
if (!e.target.classList.contains('o_editable_date_field_linked')) {
this.$editable.find('.o_editable_date_field_linked').removeClass('o_editable_date_field_linked');
}
if (e.target.closest('.oe-toolbar')) {
this._onToolbar = true;
} else {