From 0322c81efc29a7ad083cdf855f041d40abe72e0a Mon Sep 17 00:00:00 2001 From: OCA-git-bot <oca-git-bot@odoo-community.org> Date: Sat, 9 Mar 2024 15:32:49 +0000 Subject: [PATCH] [BOT] post-merge updates --- README.md | 1 + setup/_metapackage/VERSION.txt | 2 +- setup/_metapackage/setup.py | 1 + web_widget_ckeditor/README.rst | 23 ++++---- .../static/description/index.html | 59 ++++++++++--------- 5 files changed, 46 insertions(+), 40 deletions(-) diff --git a/README.md b/README.md index 027faef09..54fd9c856 100644 --- a/README.md +++ b/README.md @@ -67,6 +67,7 @@ addon | version | maintainers | summary [web_view_calendar_list](web_view_calendar_list/) | 13.0.1.0.1 | | Show calendars as a List [web_widget_bokeh_chart](web_widget_bokeh_chart/) | 13.0.1.1.0 | [](https://github.com/LoisRForgeFlow) | This widget allows to display charts using Bokeh library. [web_widget_child_selector](web_widget_child_selector/) | 13.0.1.0.0 | | Widget used for navigation on hierarchy fields +[web_widget_ckeditor](web_widget_ckeditor/) | 13.0.1.0.0 | [](https://github.com/ivantodorovich) | Provides a widget for editing HTML fields using CKEditor [web_widget_domain_editor_dialog](web_widget_domain_editor_dialog/) | 13.0.1.0.4 | | Recovers the Domain Editor Dialog functionality [web_widget_dropdown_dynamic](web_widget_dropdown_dynamic/) | 13.0.1.0.0 | | This module adds support for dynamic dropdown widget [web_widget_dropdown_dynamic_example](web_widget_dropdown_dynamic_example/) | 13.0.1.0.0 | | Demonstration of web_widget_dropdown_dynamic diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt index 3210328ed..6aeb6dd2e 100644 --- a/setup/_metapackage/VERSION.txt +++ b/setup/_metapackage/VERSION.txt @@ -1 +1 @@ -13.0.20240302.0 \ No newline at end of file +13.0.20240309.0 \ No newline at end of file diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py index aaf24ede3..ec739045e 100644 --- a/setup/_metapackage/setup.py +++ b/setup/_metapackage/setup.py @@ -49,6 +49,7 @@ setuptools.setup( 'odoo13-addon-web_view_calendar_list', 'odoo13-addon-web_widget_bokeh_chart', 'odoo13-addon-web_widget_child_selector', + 'odoo13-addon-web_widget_ckeditor', 'odoo13-addon-web_widget_domain_editor_dialog', 'odoo13-addon-web_widget_dropdown_dynamic', 'odoo13-addon-web_widget_dropdown_dynamic_example', diff --git a/web_widget_ckeditor/README.rst b/web_widget_ckeditor/README.rst index f55b1f463..ac2249d83 100644 --- a/web_widget_ckeditor/README.rst +++ b/web_widget_ckeditor/README.rst @@ -2,10 +2,13 @@ CKEditor Widget =============== -.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:58600d82032efaf1428667ec61ed8391863ccad212116a5056825a17f8caccdd + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png :target: https://odoo-community.org/page/development-status @@ -14,16 +17,16 @@ CKEditor Widget :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github - :target: https://github.com/OCA/web/tree/14.0/web_widget_ckeditor + :target: https://github.com/OCA/web/tree/13.0/web_widget_ckeditor :alt: OCA/web .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/web-14-0/web-14-0-web_widget_ckeditor + :target: https://translation.odoo-community.org/projects/web-13-0/web-13-0-web_widget_ckeditor :alt: Translate me on Weblate -.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/162/14.0 - :alt: Try me on Runbot +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/builds?repo=OCA/web&target_branch=13.0 + :alt: Try me on Runboat -|badge1| |badge2| |badge3| |badge4| |badge5| +|badge1| |badge2| |badge3| |badge4| |badge5| This module adds a new widget `ckeditor` to edit HTML fields using CKEditor. @@ -90,8 +93,8 @@ Bug Tracker Bugs are tracked on `GitHub Issues <https://github.com/OCA/web/issues>`_. In case of trouble, please check there if your issue has already been reported. -If you spotted it first, help us smashing it by providing a detailed and welcomed -`feedback <https://github.com/OCA/web/issues/new?body=module:%20web_widget_ckeditor%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_. +If you spotted it first, help us to smash it by providing a detailed and welcomed +`feedback <https://github.com/OCA/web/issues/new?body=module:%20web_widget_ckeditor%0Aversion:%2013.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_. Do not contact contributors directly about support or help with technical issues. @@ -138,6 +141,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__: |maintainer-ivantodorovich| -This module is part of the `OCA/web <https://github.com/OCA/web/tree/14.0/web_widget_ckeditor>`_ project on GitHub. +This module is part of the `OCA/web <https://github.com/OCA/web/tree/13.0/web_widget_ckeditor>`_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/web_widget_ckeditor/static/description/index.html b/web_widget_ckeditor/static/description/index.html index b3377db68..325c71025 100644 --- a/web_widget_ckeditor/static/description/index.html +++ b/web_widget_ckeditor/static/description/index.html @@ -1,20 +1,19 @@ -<?xml version="1.0" encoding="utf-8" ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils: https://docutils.sourceforge.io/" /> <title>CKEditor Widget</title> <style type="text/css"> /* :Author: David Goodger (goodger@python.org) -:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $ +:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $ :Copyright: This stylesheet has been placed in the public domain. Default cascading style sheet for the HTML output of Docutils. -See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to +See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to customize this style sheet. */ @@ -366,25 +365,27 @@ ul.auto-toc { <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!! source digest: sha256:58600d82032efaf1428667ec61ed8391863ccad212116a5056825a17f8caccdd !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/web/tree/14.0/web_widget_ckeditor"><img alt="OCA/web" src="https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/web-14-0/web-14-0-web_widget_ckeditor"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/162/14.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p> +<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/web/tree/13.0/web_widget_ckeditor"><img alt="OCA/web" src="https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/web-13-0/web-13-0-web_widget_ckeditor"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/web&target_branch=13.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p> <p>This module adds a new widget <cite>ckeditor</cite> to edit HTML fields using CKEditor.</p> <p><strong>Table of contents</strong></p> <div class="contents local topic" id="contents"> <ul class="simple"> -<li><a class="reference internal" href="#configuration" id="id1">Configuration</a></li> -<li><a class="reference internal" href="#known-issues-roadmap" id="id2">Known issues / Roadmap</a></li> -<li><a class="reference internal" href="#bug-tracker" id="id3">Bug Tracker</a></li> -<li><a class="reference internal" href="#credits" id="id4">Credits</a><ul> -<li><a class="reference internal" href="#authors" id="id5">Authors</a></li> -<li><a class="reference internal" href="#contributors" id="id6">Contributors</a></li> -<li><a class="reference internal" href="#maintainers" id="id7">Maintainers</a></li> +<li><a class="reference internal" href="#configuration" id="toc-entry-1">Configuration</a></li> +<li><a class="reference internal" href="#known-issues-roadmap" id="toc-entry-2">Known issues / Roadmap</a></li> +<li><a class="reference internal" href="#bug-tracker" id="toc-entry-3">Bug Tracker</a></li> +<li><a class="reference internal" href="#credits" id="toc-entry-4">Credits</a><ul> +<li><a class="reference internal" href="#authors" id="toc-entry-5">Authors</a></li> +<li><a class="reference internal" href="#contributors" id="toc-entry-6">Contributors</a></li> +<li><a class="reference internal" href="#maintainers" id="toc-entry-7">Maintainers</a></li> </ul> </li> </ul> </div> <div class="section" id="configuration"> -<h1><a class="toc-backref" href="#id1">Configuration</a></h1> +<h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1> <p>By default, this module will replace the original <cite>html</cite> wysiwyg field with CKEditor. The original <cite>html</cite> widget will be renamed as <cite>html_odoo</cite>.</p> <p>If you only want to use <cite>ckeditor</cite> on specific views, you can disable the <cite>html</cite> widget @@ -392,7 +393,7 @@ override by archiving the <cite>web_widget_ckeditor.assets_backend_field_html_ov <p>When the global <cite>html</cite> widget replacement is disabled, <cite>ckeditor</cite> has to be explicitly set on the desired <cite>ir.ui.view</cite>:</p> <pre class="code xml literal-block"> -<span class="nt"><field</span> <span class="na">name=</span><span class="s">"description_html"</span> <span class="na">widget=</span><span class="s">"ckeditor"</span> <span class="nt">/></span> +<span class="nt"><field</span><span class="w"> </span><span class="na">name=</span><span class="s">"description_html"</span><span class="w"> </span><span class="na">widget=</span><span class="s">"ckeditor"</span><span class="w"> </span><span class="nt">/></span> </pre> <p>The CKEditor toolbar can be customized with an <cite>ir.config_parameter</cite>. To do so, please create a parameter named <cite>web_widget_ckeditor.toolbar</cite>, and set the desired @@ -410,16 +411,16 @@ heading <a class="reference external" href="https://ckeditor.com/docs/ckeditor5/latest/features/toolbar/toolbar.html">official CKEditor documentation page</a></p> </div> <div class="section" id="known-issues-roadmap"> -<h1><a class="toc-backref" href="#id2">Known issues / Roadmap</a></h1> +<h1><a class="toc-backref" href="#toc-entry-2">Known issues / Roadmap</a></h1> <ul class="simple"> <li>Allow to configure toolbar using widget’s options.</li> </ul> <pre class="code xml literal-block"> -<span class="nt"><field</span> - <span class="na">name=</span><span class="s">"description_html"</span> - <span class="na">widget=</span><span class="s">"ckeditor"</span> - <span class="na">options=</span><span class="s">"{'bulletedList': false, 'pageBreak': true}"</span> -<span class="nt">/></span> +<span class="nt"><field</span><span class="w"> + </span><span class="na">name=</span><span class="s">"description_html"</span><span class="w"> + </span><span class="na">widget=</span><span class="s">"ckeditor"</span><span class="w"> + </span><span class="na">options=</span><span class="s">"{'bulletedList': false, 'pageBreak': true}"</span><span class="w"> +</span><span class="nt">/></span> </pre> <ul class="simple"> <li>There seems to be a small incompatibility issue with <cite>web_drop_target</cite>. @@ -427,24 +428,24 @@ heading </ul> </div> <div class="section" id="bug-tracker"> -<h1><a class="toc-backref" href="#id3">Bug Tracker</a></h1> +<h1><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h1> <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/web/issues">GitHub Issues</a>. In case of trouble, please check there if your issue has already been reported. -If you spotted it first, help us smashing it by providing a detailed and welcomed -<a class="reference external" href="https://github.com/OCA/web/issues/new?body=module:%20web_widget_ckeditor%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p> +If you spotted it first, help us to smash it by providing a detailed and welcomed +<a class="reference external" href="https://github.com/OCA/web/issues/new?body=module:%20web_widget_ckeditor%0Aversion:%2013.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p> <p>Do not contact contributors directly about support or help with technical issues.</p> </div> <div class="section" id="credits"> -<h1><a class="toc-backref" href="#id4">Credits</a></h1> +<h1><a class="toc-backref" href="#toc-entry-4">Credits</a></h1> <div class="section" id="authors"> -<h2><a class="toc-backref" href="#id5">Authors</a></h2> +<h2><a class="toc-backref" href="#toc-entry-5">Authors</a></h2> <ul class="simple"> <li>Therp BV</li> <li>Camptocamp SA</li> </ul> </div> <div class="section" id="contributors"> -<h2><a class="toc-backref" href="#id6">Contributors</a></h2> +<h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2> <ul> <li><p class="first"><a class="reference external" href="https://www.therp.nl">Therp</a></p> <blockquote> @@ -465,15 +466,15 @@ If you spotted it first, help us smashing it by providing a detailed and welcome </ul> </div> <div class="section" id="maintainers"> -<h2><a class="toc-backref" href="#id7">Maintainers</a></h2> +<h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2> <p>This module is maintained by the OCA.</p> <a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a> <p>OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use.</p> <p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p> -<p><a class="reference external" href="https://github.com/ivantodorovich"><img alt="ivantodorovich" src="https://github.com/ivantodorovich.png?size=40px" /></a></p> -<p>This module is part of the <a class="reference external" href="https://github.com/OCA/web/tree/14.0/web_widget_ckeditor">OCA/web</a> project on GitHub.</p> +<p><a class="reference external image-reference" href="https://github.com/ivantodorovich"><img alt="ivantodorovich" src="https://github.com/ivantodorovich.png?size=40px" /></a></p> +<p>This module is part of the <a class="reference external" href="https://github.com/OCA/web/tree/13.0/web_widget_ckeditor">OCA/web</a> project on GitHub.</p> <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p> </div> </div>