diff --git a/modules/marketing_automation/marketing_automation.py b/modules/marketing_automation/marketing_automation.py index 7d81c7377c..db9ba6b0ea 100644 --- a/modules/marketing_automation/marketing_automation.py +++ b/modules/marketing_automation/marketing_automation.py @@ -47,12 +47,6 @@ from trytond.wsgi import Base64Converter from .exceptions import ConditionError, DomainError, TemplateError from .mixin import MarketingAutomationMixin -if not config.get( - 'html', 'plugins-marketing.automation.activity-email_template'): - config.set( - 'html', 'plugins-marketing.automation.activity-email_template', - 'fullpage') - USE_SSL = bool(config.get('ssl', 'certificate')) URL_BASE = config.get('marketing', 'automation_base', default=http_host()) URL_OPEN = urljoin(URL_BASE, '/m/empty.gif') diff --git a/modules/marketing_email/marketing.py b/modules/marketing_email/marketing.py index 5f02e317f1..bb6c6deb58 100644 --- a/modules/marketing_email/marketing.py +++ b/modules/marketing_email/marketing.py @@ -38,12 +38,6 @@ from trytond.wizard import Button, StateTransition, StateView, Wizard from .exceptions import EMailValidationError, TemplateError -if not config.get( - 'html', 'plugins-marketing.email.message-content'): - config.set( - 'html', 'plugins-marketing.email.message-content', - 'fullpage') - URL_BASE = config.get('marketing', 'email_base', default=http_host()) URL_OPEN = urljoin(URL_BASE, '/m/empty.gif') diff --git a/modules/web_shop/product.py b/modules/web_shop/product.py index 04c049f532..7cb71bed63 100644 --- a/modules/web_shop/product.py +++ b/modules/web_shop/product.py @@ -1,15 +1,10 @@ # This file is part of Tryton. The COPYRIGHT file at the top level of # this repository contains the full copyright notices and license terms. -from trytond.config import config from trytond.model import fields from trytond.pool import PoolMeta from trytond.pyson import Eval -if not config.get('html', 'plugins-product.template-web_shop_description'): - config.set( - 'html', 'plugins-product.template-web_shop_description', 'fullpage') - class Template(metaclass=PoolMeta): __name__ = 'product.template' diff --git a/trytond/CHANGELOG b/trytond/CHANGELOG index 920b99dfd1..a8942b3944 100644 --- a/trytond/CHANGELOG +++ b/trytond/CHANGELOG @@ -1,3 +1,4 @@ +* Update TinyMCE to version 7 * Add python-format flag to PO files * Add partial support for constraints with SQLite backend diff --git a/trytond/trytond/ir/action.py b/trytond/trytond/ir/action.py index f86cc9521f..a93a2d0746 100644 --- a/trytond/trytond/ir/action.py +++ b/trytond/trytond/ir/action.py @@ -8,7 +8,6 @@ from operator import itemgetter from genshi.template.text import TextTemplate from trytond.cache import Cache, MemoryCache -from trytond.config import config from trytond.i18n import gettext from trytond.model import ( DeactivableMixin, Index, ModelSingleton, ModelSQL, ModelStorage, ModelView, @@ -21,10 +20,6 @@ from trytond.tools import file_open from trytond.transaction import ( Transaction, inactive_records, without_check_access) -if not config.get('html', 'plugins-ir.action.report-report_content_html'): - config.set( - 'html', 'plugins-ir.action.report-report_content_html', 'fullpage') - class WizardModelError(ValidationError): pass diff --git a/trytond/trytond/ir/routes.py b/trytond/trytond/ir/routes.py index fe5efbc145..02b48da454 100644 --- a/trytond/trytond/ir/routes.py +++ b/trytond/trytond/ir/routes.py @@ -16,7 +16,8 @@ from trytond.transaction import Transaction from trytond.wsgi import app SOURCE = config.get( - 'html', 'src', default='https://cloud.tinymce.com/stable/tinymce.min.js') + 'html', 'src', + default='https://cdn.tiny.cloud/1/no-api-key/tinymce/7/tinymce.min.js') AVATAR_TIMEOUT = config.getint( 'web', 'avatar_timeout', default=7 * 24 * 60 * 60) @@ -102,54 +103,54 @@ TEMPLATE = '''
- +