Techsystech
/
web_techsystech
forked from Techsystech/web
3
0
Fork 0
Code Pull Requests Activity

Merge PR #2142 into 14.0 

Signed-off-by ivantodorovich
14.0
OCA-git-bot 2022-02-07 18:50:14 +00:00
parent 43b82f0c02 e1140a7a88
commit c06c1e3f22
4 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web_widget_ckeditor/__init__.py
View File

@ -1 +1 @@
# from . import models
from . import models

1
web_widget_ckeditor/models/__init__.py 100644
View File

@ -0,0 +1 @@
from . import ir_config_parameter

16
web_widget_ckeditor/models/ir_config_parameter.py 100644
View File

@ -0,0 +1,16 @@
# Copyright 2022 Camptocamp SA (https://www.camptocamp.com).
# @author Iván Todorovich <ivan.todorovich@camptocamp.com>
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
from odoo import api, models
class IrConfigParameter(models.Model):
_inherit = "ir.config_parameter"
@api.model
def get_web_widget_ckeditor_config(self):
get_param = self.sudo().get_param
return {
"toolbar": get_param("web_widget_ckeditor.toolbar"),
}

26
web_widget_ckeditor/static/src/js/field_ckeditor.js
View File

@ -17,22 +17,21 @@ odoo.define("web_widget_ckeditor.field_ckeditor", function (require) {
const TranslatableFieldMixin = basic_fields.TranslatableFieldMixin;
// Load configuration for the editor
const defaultCKEditorToolbarPromise = rpc.query({
const getCKEditorConfigPromise = rpc.query({
model: "ir.config_parameter",
method: "get_param",
args: ["web_widget_ckeditor.toolbar"],
method: "get_web_widget_ckeditor_config",
});
// Load CKEditor localization files
async function loadCKEditorLanguageSource(languageCode) {
if (languageCode == "en") {
if (languageCode === "en") {
return;
}
const languageURL = `/web_widget_ckeditor/static/lib/ckeditor/build/translations/${languageCode}.js`;
try {
ajax.loadJS(languageURL);
} catch (error) {
console.warning("Unable to load CKEditor language: ", languageCode);
console.warn("Unable to load CKEditor language: ", languageCode);
}
}
const CKEditorLanguageCode = session.user_context.lang.split("_")[0];
@ -87,9 +86,10 @@ odoo.define("web_widget_ckeditor.field_ckeditor", function (require) {
* @override
*/
isSet: function () {
var value =
// Removing spaces & html spaces
const value =
this.value &&
this.value.split("&nbsp;").join("").replace(/\s/g, ""); // Removing spaces & html spaces
this.value.split("&nbsp;").join("").replace(/\s/g, "");
return (
value &&
value !== "<p></p>" &&
@ -143,19 +143,19 @@ odoo.define("web_widget_ckeditor.field_ckeditor", function (require) {
*/
_getCKEditorToolbarItems: async function () {
try {
const toolbarConfig = await defaultCKEditorToolbarPromise;
if (toolbarConfig) {
return toolbarConfig.split(/[\s,]+/).filter((item) => item);
const ckconfig = await getCKEditorConfigPromise;
if (ckconfig.toolbar) {
return ckconfig.toolbar.split(/[\s,]+/).filter((item) => item);
}
} catch (error) {
console.warning(
console.warn(
"Unable to use CKEditor toolbar configuration: ",
error
);
console.warning(
console.warn(
"Please check the value for ir.config_parameter 'web_widget_ckeditor.toolbar' is correct"
);
console.warning("Using default toolbar configuration");
console.warn("Using default toolbar configuration");
}
return [
"heading",