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

[FIX] web_editor: do not store base64 of cropped image to html field

Browse Source 
On crop dialog save, the image src is set to the base64.
We are creating an attachment for the cropped image if the user save the changes
and after that, we set the newly created image as the src of that image.

Meanwhile, when the user save the 'html' field, it is not creating
any attachment for the cropped image and also it leaves base64 as it is.
Due to that field store large data into the database.

this commit makes sure that attachment is created for cropped images
and update src before storing field value to the database.

closes odoo/odoo#46455

X-original-commit: 2bcaa25e67260e3013d4400d1b3ce380ba5cbd1d
Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
This commit is contained in:
Kishan Gajjar
2020-02-27 13:53:25 +00:00
parent 12fa83bb44
commit a4451579bc
5 changed files with 85 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web_editor/static/src/js/backend/field_html.js
+5 -3
View File
@@ -107,9 +107,11 @@ var FieldHtml = basic_fields.DebouncedField.extend(TranslatableFieldMixin, {
return this._super();
}
var _super = this._super.bind(this);
return this.wysiwyg.save().then(function (result) {
self._isDirty = result.isDirty;
_super();
return this.wysiwyg.saveCroppedImages(this.$content).then(function () {
return self.wysiwyg.save().then(function (result) {
self._isDirty = result.isDirty;
_super();
});
});
},
/**
addons/web_editor/static/src/js/editor/editor.js
+1 -44
View File
@@ -229,50 +229,7 @@ var EditorMenuBar = Widget.extend({
* @private
*/
_saveCroppedImages: function () {
var self = this;
var defs = _.map(this.rte.editable().find('.o_cropped_img_to_save'), function (croppedImg) {
var $croppedImg = $(croppedImg);
$croppedImg.removeClass('o_cropped_img_to_save');
var resModel = $croppedImg.data('crop:resModel');
var resID = $croppedImg.data('crop:resID');
var cropID = $croppedImg.data('crop:id');
var mimetype = $croppedImg.data('crop:mimetype');
var originalSrc = $croppedImg.data('crop:originalSrc');
var datas = $croppedImg.attr('src').split(',')[1];
if (!cropID) {
var name = originalSrc + '.crop';
return self._rpc({
model: 'ir.attachment',
method: 'create',
args: [{
res_model: resModel,
res_id: resID,
name: name,
datas: datas,
mimetype: mimetype,
url: originalSrc, // To save the original image that was cropped
}],
}).then(function (attachmentID) {
return self._rpc({
model: 'ir.attachment',
method: 'generate_access_token',
args: [[attachmentID]],
}).then(function (access_token) {
$croppedImg.attr('src', '/web/image/' + attachmentID + '?access_token=' + access_token[0]);
});
});
} else {
return self._rpc({
model: 'ir.attachment',
method: 'write',
args: [[cropID], {datas: datas}],
});
}
});
return Promise.all(defs);
return this.rte.saveCroppedImages(this.rte.editable());
},
//--------------------------------------------------------------------------
addons/web_editor/static/src/js/editor/rte.summernote.js
+68 -1
View File
@@ -9,6 +9,7 @@ var ColorPaletteWidget = require('web_editor.ColorPalette').ColorPaletteWidget;
var mixins = require('web.mixins');
var fonts = require('wysiwyg.fonts');
var rte = require('web_editor.rte');
var ServicesMixin = require('web.ServicesMixin');
var weWidgets = require('wysiwyg.widgets');
var _t = core._t;
@@ -1051,7 +1052,7 @@ $.summernote.lang.odoo = {
* instantiate media, link and alt dialogs outside the main editor: in the
* simple HTML fields and forum textarea.
*/
var SummernoteManager = Class.extend(mixins.EventDispatcherMixin, {
var SummernoteManager = Class.extend(mixins.EventDispatcherMixin, ServicesMixin, {
/**
* @constructor
*/
@@ -1076,6 +1077,58 @@ var SummernoteManager = Class.extend(mixins.EventDispatcherMixin, {
core.bus.off('media_dialog_demand', this, this._onMediaDialogDemand);
},
/**
* Create/Update cropped attachments.
*
* @param {jQuery} $editable
* @returns {Promise}
*/
saveCroppedImages: function ($editable) {
var defs = _.map($editable.find('.o_cropped_img_to_save'), croppedImg => {
var $croppedImg = $(croppedImg);
$croppedImg.removeClass('o_cropped_img_to_save');
var resModel = $croppedImg.data('crop:resModel');
var resID = $croppedImg.data('crop:resID');
var cropID = $croppedImg.data('crop:id');
var mimetype = $croppedImg.data('crop:mimetype');
var originalSrc = $croppedImg.data('crop:originalSrc');
var datas = $croppedImg.attr('src').split(',')[1];
if (!cropID) {
var name = originalSrc + '.crop';
return this._rpc({
model: 'ir.attachment',
method: 'create',
args: [{
res_model: resModel,
res_id: resID,
name: name,
datas: datas,
mimetype: mimetype,
url: originalSrc, // To save the original image that was cropped
}],
}).then(attachmentID => {
return this._rpc({
model: 'ir.attachment',
method: 'generate_access_token',
args: [[attachmentID]],
}).then(access_token => {
$croppedImg.attr('src', '/web/image/' + attachmentID + '?access_token=' + access_token[0]);
});
});
} else {
return this._rpc({
model: 'ir.attachment',
method: 'write',
args: [[cropID], {datas: datas}],
});
}
});
return Promise.all(defs);
},
//--------------------------------------------------------------------------
// Handlers
//--------------------------------------------------------------------------
@@ -1201,6 +1254,20 @@ rte.Class.include({
this._super.apply(this, arguments);
this._summernoteManager.destroy();
},
//--------------------------------------------------------------------------
// Public
//--------------------------------------------------------------------------
/**
* Create/Update cropped attachments.
*
* @param {jQuery} $editable
* @returns {Deferred}
*/
saveCroppedImages: function ($editable) {
return this._summernoteManager.saveCroppedImages($editable);
},
});
return SummernoteManager;
});
addons/web_editor/static/src/js/wysiwyg/root.js
+1 -1
View File
@@ -8,7 +8,7 @@ var assetsLoaded = false;
var WysiwygRoot = Widget.extend({
assetLibs: ['web_editor.compiled_assets_wysiwyg'],
publicMethods: ['isDirty', 'save', 'getValue', 'setValue', 'getEditable', 'on', 'trigger', 'focus'],
publicMethods: ['isDirty', 'save', 'getValue', 'setValue', 'getEditable', 'on', 'trigger', 'focus', 'saveCroppedImages'],
/**
* @see 'web_editor.wysiwyg' module
addons/web_editor/static/src/js/wysiwyg/wysiwyg.js
+10 -1
View File
@@ -59,7 +59,7 @@ var Wysiwyg = Widget.extend({
* @override
**/
willStart: function () {
new SummernoteManager(this);
this._summernoteManager = new SummernoteManager(this);
this.$target = this.$el;
return this._super();
},
@@ -152,6 +152,15 @@ var Wysiwyg = Widget.extend({
}
return Promise.resolve({isDirty:isDirty, html:html});
},
/**
* Create/Update cropped attachments.
*
* @param {jQuery} $editable
* @returns {Promise}
*/
saveCroppedImages: function ($editable) {
return this._summernoteManager.saveCroppedImages($editable);
},
/**
* @param {String} value
* @param {Object} options