Skip to content

Commit 0322c81

Browse files
committed
[BOT] post-merge updates
1 parent 58fcd1a commit 0322c81

File tree

5 files changed

+46
-40
lines changed

5 files changed

+46
-40
lines changed

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ addon | version | maintainers | summary
6767
[web_view_calendar_list](web_view_calendar_list/) | 13.0.1.0.1 | | Show calendars as a List
6868
[web_widget_bokeh_chart](web_widget_bokeh_chart/) | 13.0.1.1.0 | [![LoisRForgeFlow](https://github.com/LoisRForgeFlow.png?size=30px)](https://github.com/LoisRForgeFlow) | This widget allows to display charts using Bokeh library.
6969
[web_widget_child_selector](web_widget_child_selector/) | 13.0.1.0.0 | | Widget used for navigation on hierarchy fields
70+
[web_widget_ckeditor](web_widget_ckeditor/) | 13.0.1.0.0 | [![ivantodorovich](https://github.com/ivantodorovich.png?size=30px)](https://github.com/ivantodorovich) | Provides a widget for editing HTML fields using CKEditor
7071
[web_widget_domain_editor_dialog](web_widget_domain_editor_dialog/) | 13.0.1.0.4 | | Recovers the Domain Editor Dialog functionality
7172
[web_widget_dropdown_dynamic](web_widget_dropdown_dynamic/) | 13.0.1.0.0 | | This module adds support for dynamic dropdown widget
7273
[web_widget_dropdown_dynamic_example](web_widget_dropdown_dynamic_example/) | 13.0.1.0.0 | | Demonstration of web_widget_dropdown_dynamic

setup/_metapackage/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
13.0.20240302.0
1+
13.0.20240309.0

setup/_metapackage/setup.py

+1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
'odoo13-addon-web_view_calendar_list',
5050
'odoo13-addon-web_widget_bokeh_chart',
5151
'odoo13-addon-web_widget_child_selector',
52+
'odoo13-addon-web_widget_ckeditor',
5253
'odoo13-addon-web_widget_domain_editor_dialog',
5354
'odoo13-addon-web_widget_dropdown_dynamic',
5455
'odoo13-addon-web_widget_dropdown_dynamic_example',

web_widget_ckeditor/README.rst

+13-10
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22
CKEditor Widget
33
===============
44

5-
.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5+
..
6+
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
67
!! This file is generated by oca-gen-addon-readme !!
78
!! changes will be overwritten. !!
89
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
10+
!! source digest: sha256:58600d82032efaf1428667ec61ed8391863ccad212116a5056825a17f8caccdd
11+
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
912
1013
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
1114
:target: https://odoo-community.org/page/development-status
@@ -14,16 +17,16 @@ CKEditor Widget
1417
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
1518
:alt: License: AGPL-3
1619
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github
17-
:target: https://github.com/OCA/web/tree/14.0/web_widget_ckeditor
20+
:target: https://github.com/OCA/web/tree/13.0/web_widget_ckeditor
1821
:alt: OCA/web
1922
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
20-
:target: https://translation.odoo-community.org/projects/web-14-0/web-14-0-web_widget_ckeditor
23+
:target: https://translation.odoo-community.org/projects/web-13-0/web-13-0-web_widget_ckeditor
2124
:alt: Translate me on Weblate
22-
.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
23-
:target: https://runbot.odoo-community.org/runbot/162/14.0
24-
:alt: Try me on Runbot
25+
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
26+
:target: https://runboat.odoo-community.org/builds?repo=OCA/web&target_branch=13.0
27+
:alt: Try me on Runboat
2528

26-
|badge1| |badge2| |badge3| |badge4| |badge5|
29+
|badge1| |badge2| |badge3| |badge4| |badge5|
2730

2831
This module adds a new widget `ckeditor` to edit HTML fields using CKEditor.
2932

@@ -90,8 +93,8 @@ Bug Tracker
9093

9194
Bugs are tracked on `GitHub Issues <https://github.com/OCA/web/issues>`_.
9295
In case of trouble, please check there if your issue has already been reported.
93-
If you spotted it first, help us smashing it by providing a detailed and welcomed
94-
`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**>`_.
96+
If you spotted it first, help us to smash it by providing a detailed and welcomed
97+
`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**>`_.
9598

9699
Do not contact contributors directly about support or help with technical issues.
97100

@@ -138,6 +141,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
138141

139142
|maintainer-ivantodorovich|
140143

141-
This module is part of the `OCA/web <https://github.com/OCA/web/tree/14.0/web_widget_ckeditor>`_ project on GitHub.
144+
This module is part of the `OCA/web <https://github.com/OCA/web/tree/13.0/web_widget_ckeditor>`_ project on GitHub.
142145

143146
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

web_widget_ckeditor/static/description/index.html

+30-29
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
21
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
32
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
43
<head>
54
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
6-
<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
5+
<meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
76
<title>CKEditor Widget</title>
87
<style type="text/css">
98

109
/*
1110
:Author: David Goodger ([email protected])
12-
:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
11+
:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
1312
:Copyright: This stylesheet has been placed in the public domain.
1413
1514
Default cascading style sheet for the HTML output of Docutils.
1615
17-
See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
16+
See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
1817
customize this style sheet.
1918
*/
2019

@@ -366,33 +365,35 @@ <h1 class="title">CKEditor Widget</h1>
366365
<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
367366
!! This file is generated by oca-gen-addon-readme !!
368367
!! changes will be overwritten. !!
368+
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
369+
!! source digest: sha256:58600d82032efaf1428667ec61ed8391863ccad212116a5056825a17f8caccdd
369370
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
370-
<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>
371+
<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&amp;target_branch=13.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
371372
<p>This module adds a new widget <cite>ckeditor</cite> to edit HTML fields using CKEditor.</p>
372373
<p><strong>Table of contents</strong></p>
373374
<div class="contents local topic" id="contents">
374375
<ul class="simple">
375-
<li><a class="reference internal" href="#configuration" id="id1">Configuration</a></li>
376-
<li><a class="reference internal" href="#known-issues-roadmap" id="id2">Known issues / Roadmap</a></li>
377-
<li><a class="reference internal" href="#bug-tracker" id="id3">Bug Tracker</a></li>
378-
<li><a class="reference internal" href="#credits" id="id4">Credits</a><ul>
379-
<li><a class="reference internal" href="#authors" id="id5">Authors</a></li>
380-
<li><a class="reference internal" href="#contributors" id="id6">Contributors</a></li>
381-
<li><a class="reference internal" href="#maintainers" id="id7">Maintainers</a></li>
376+
<li><a class="reference internal" href="#configuration" id="toc-entry-1">Configuration</a></li>
377+
<li><a class="reference internal" href="#known-issues-roadmap" id="toc-entry-2">Known issues / Roadmap</a></li>
378+
<li><a class="reference internal" href="#bug-tracker" id="toc-entry-3">Bug Tracker</a></li>
379+
<li><a class="reference internal" href="#credits" id="toc-entry-4">Credits</a><ul>
380+
<li><a class="reference internal" href="#authors" id="toc-entry-5">Authors</a></li>
381+
<li><a class="reference internal" href="#contributors" id="toc-entry-6">Contributors</a></li>
382+
<li><a class="reference internal" href="#maintainers" id="toc-entry-7">Maintainers</a></li>
382383
</ul>
383384
</li>
384385
</ul>
385386
</div>
386387
<div class="section" id="configuration">
387-
<h1><a class="toc-backref" href="#id1">Configuration</a></h1>
388+
<h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1>
388389
<p>By default, this module will replace the original <cite>html</cite> wysiwyg field with CKEditor.
389390
The original <cite>html</cite> widget will be renamed as <cite>html_odoo</cite>.</p>
390391
<p>If you only want to use <cite>ckeditor</cite> on specific views, you can disable the <cite>html</cite> widget
391392
override by archiving the <cite>web_widget_ckeditor.assets_backend_field_html_override</cite> view.</p>
392393
<p>When the global <cite>html</cite> widget replacement is disabled, <cite>ckeditor</cite> has to be explicitly
393394
set on the desired <cite>ir.ui.view</cite>:</p>
394395
<pre class="code xml literal-block">
395-
<span class="nt">&lt;field</span> <span class="na">name=</span><span class="s">&quot;description_html&quot;</span> <span class="na">widget=</span><span class="s">&quot;ckeditor&quot;</span> <span class="nt">/&gt;</span>
396+
<span class="nt">&lt;field</span><span class="w"> </span><span class="na">name=</span><span class="s">&quot;description_html&quot;</span><span class="w"> </span><span class="na">widget=</span><span class="s">&quot;ckeditor&quot;</span><span class="w"> </span><span class="nt">/&gt;</span>
396397
</pre>
397398
<p>The CKEditor toolbar can be customized with an <cite>ir.config_parameter</cite>. To do so,
398399
please create a parameter named <cite>web_widget_ckeditor.toolbar</cite>, and set the desired
@@ -410,41 +411,41 @@ <h1><a class="toc-backref" href="#id1">Configuration</a></h1>
410411
<a class="reference external" href="https://ckeditor.com/docs/ckeditor5/latest/features/toolbar/toolbar.html">official CKEditor documentation page</a></p>
411412
</div>
412413
<div class="section" id="known-issues-roadmap">
413-
<h1><a class="toc-backref" href="#id2">Known issues / Roadmap</a></h1>
414+
<h1><a class="toc-backref" href="#toc-entry-2">Known issues / Roadmap</a></h1>
414415
<ul class="simple">
415416
<li>Allow to configure toolbar using widget’s options.</li>
416417
</ul>
417418
<pre class="code xml literal-block">
418-
<span class="nt">&lt;field</span>
419-
<span class="na">name=</span><span class="s">&quot;description_html&quot;</span>
420-
<span class="na">widget=</span><span class="s">&quot;ckeditor&quot;</span>
421-
<span class="na">options=</span><span class="s">&quot;{'bulletedList': false, 'pageBreak': true}&quot;</span>
422-
<span class="nt">/&gt;</span>
419+
<span class="nt">&lt;field</span><span class="w">
420+
</span><span class="na">name=</span><span class="s">&quot;description_html&quot;</span><span class="w">
421+
</span><span class="na">widget=</span><span class="s">&quot;ckeditor&quot;</span><span class="w">
422+
</span><span class="na">options=</span><span class="s">&quot;{'bulletedList': false, 'pageBreak': true}&quot;</span><span class="w">
423+
</span><span class="nt">/&gt;</span>
423424
</pre>
424425
<ul class="simple">
425426
<li>There seems to be a small incompatibility issue with <cite>web_drop_target</cite>.
426427
<a class="reference external" href="https://github.com/OCA/web/pull/2083#issuecomment-970719103">More information here</a></li>
427428
</ul>
428429
</div>
429430
<div class="section" id="bug-tracker">
430-
<h1><a class="toc-backref" href="#id3">Bug Tracker</a></h1>
431+
<h1><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h1>
431432
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/web/issues">GitHub Issues</a>.
432433
In case of trouble, please check there if your issue has already been reported.
433-
If you spotted it first, help us smashing it by providing a detailed and welcomed
434-
<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>
434+
If you spotted it first, help us to smash it by providing a detailed and welcomed
435+
<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>
435436
<p>Do not contact contributors directly about support or help with technical issues.</p>
436437
</div>
437438
<div class="section" id="credits">
438-
<h1><a class="toc-backref" href="#id4">Credits</a></h1>
439+
<h1><a class="toc-backref" href="#toc-entry-4">Credits</a></h1>
439440
<div class="section" id="authors">
440-
<h2><a class="toc-backref" href="#id5">Authors</a></h2>
441+
<h2><a class="toc-backref" href="#toc-entry-5">Authors</a></h2>
441442
<ul class="simple">
442443
<li>Therp BV</li>
443444
<li>Camptocamp SA</li>
444445
</ul>
445446
</div>
446447
<div class="section" id="contributors">
447-
<h2><a class="toc-backref" href="#id6">Contributors</a></h2>
448+
<h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
448449
<ul>
449450
<li><p class="first"><a class="reference external" href="https://www.therp.nl">Therp</a></p>
450451
<blockquote>
@@ -465,15 +466,15 @@ <h2><a class="toc-backref" href="#id6">Contributors</a></h2>
465466
</ul>
466467
</div>
467468
<div class="section" id="maintainers">
468-
<h2><a class="toc-backref" href="#id7">Maintainers</a></h2>
469+
<h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2>
469470
<p>This module is maintained by the OCA.</p>
470471
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
471472
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
472473
mission is to support the collaborative development of Odoo features and
473474
promote its widespread use.</p>
474475
<p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
475-
<p><a class="reference external" href="https://github.com/ivantodorovich"><img alt="ivantodorovich" src="https://github.com/ivantodorovich.png?size=40px" /></a></p>
476-
<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>
476+
<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>
477+
<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>
477478
<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>
478479
</div>
479480
</div>

0 commit comments

Comments
 (0)