Skip to content

Commit 829eac9

Browse files
committed
Migration to Plone 6.1.3 (#23)
1 parent 85645bb commit 829eac9

File tree

7 files changed

+100
-19
lines changed

7 files changed

+100
-19
lines changed

CHANGES.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ Changelog
55
1.2.39 (unreleased)
66
-------------------
77

8-
- Nothing changed yet.
8+
- Migration to Plone 6.1.3
9+
[boulch]
910

1011

1112
1.2.38 (2025-09-10)

base-6.1.cfg

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ extensions =
66
sources-dir = devel
77

88
extends =
9-
https://dist.plone.org/release/6.1.1/versions.cfg
10-
https://dist.plone.org/release/6.1.1/versions-ecosystem.cfg
11-
https://dist.plone.org/release/6.1.1/versions-extra.cfg
12-
https://raw.githubusercontent.com/IMIO/buildout.smartweb/main/versions.cfg
9+
https://dist.plone.org/release/6.1.3/versions.cfg
10+
https://dist.plone.org/release/6.1.3/versions-ecosystem.cfg
11+
https://dist.plone.org/release/6.1.3/versions-extra.cfg
12+
https://raw.githubusercontent.com/IMIO/buildout.smartweb/plone613/versions.cfg
1313
https://raw.githubusercontent.com/IMIO/buildout.smartweb/main/sources.cfg
1414

1515
parts =

requirements-6.1.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
-r https://dist.plone.org/release/6.1.1/requirements.txt
1+
-r https://dist.plone.org/release/6.1.3/requirements.txt

src/imio/smartweb/common/profiles/default/metadata.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<metadata>
3-
<version>1033</version>
3+
<version>1034</version>
44
<dependencies>
55
<dependency>profile-plone.restapi:default</dependency>
66
<dependency>profile-eea.facetednavigation:default</dependency>

src/imio/smartweb/common/profiles/default/registry/tinymce.xml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,8 @@
5353
<element>code</element>
5454
<element>charmap</element>
5555
<element>fullscreen</element>
56-
<element>hr</element>
5756
<element>lists</element>
5857
<element>nonbreaking</element>
59-
<element>noneditable</element>
60-
<element>paste</element>
6158
<element>searchreplace</element>
6259
<element>table</element>
6360
<element>visualblocks</element>
@@ -70,13 +67,7 @@
7067
<record interface="plone.base.interfaces.controlpanel.ITinyMCESchema"
7168
name="plone.menubar"
7269
>
73-
<value purge="true">
74-
<element>edit</element>
75-
<element>format</element>
76-
<element>insert</element>
77-
<element>table</element>
78-
<element>view</element>
79-
</value>
70+
<value purge="true">edit format insert table view</value>
8071
</record>
8172

8273
<!-- See possible values in https://www.tiny.cloud/docs/tinymce/latest/available-menu-items/ -->
@@ -106,8 +97,8 @@
10697
"items": ""
10798
},
10899
"insert": {
109-
"title": "Insert",
110-
"items": "hr"
100+
"title": "Insert",
101+
"items": "hr"
111102
},
112103
"table": {
113104
"title": "Table",

src/imio/smartweb/common/upgrades/configure.zcml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,14 @@
165165
directory="profiles/1032_to_1033"
166166
/>
167167

168+
<genericsetup:registerProfile
169+
name="upgrade_1033_to_1034"
170+
title="Upgrade common from 1033 to 1034"
171+
description="Update configuration from TinyMCE 7.7.0 to be TinyMCE 7.9.1"
172+
provides="Products.GenericSetup.interfaces.EXTENSION"
173+
directory="profiles/1033_to_1034"
174+
/>
175+
168176
<genericsetup:upgradeStep
169177
title="Configure first official release"
170178
description="Run needed registry step"
@@ -515,4 +523,15 @@
515523
/>
516524
</genericsetup:upgradeSteps>
517525

526+
<genericsetup:upgradeSteps
527+
profile="imio.smartweb.common:default"
528+
source="1033"
529+
destination="1034"
530+
>
531+
<genericsetup:upgradeDepends
532+
title="Update configuration from TinyMCE 7.7.0 to be TinyMCE 7.9.1"
533+
import_profile="imio.smartweb.common.upgrades:upgrade_1033_to_1034"
534+
/>
535+
</genericsetup:upgradeSteps>
536+
518537
</configure>
Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<registry>
3+
4+
<record interface="plone.base.interfaces.controlpanel.ITinyMCESchema"
5+
name="plone.plugins"
6+
>
7+
<value purge="true">
8+
<element>code</element>
9+
<element>charmap</element>
10+
<element>fullscreen</element>
11+
<element>lists</element>
12+
<element>nonbreaking</element>
13+
<element>searchreplace</element>
14+
<element>table</element>
15+
<element>visualblocks</element>
16+
<element>visualchars</element>
17+
<element>wordcount</element>
18+
</value>
19+
</record>
20+
21+
<!-- See possible values in https://www.tiny.cloud/docs/tinymce/latest/menus-configuration-options/#menubar -->
22+
<record interface="plone.base.interfaces.controlpanel.ITinyMCESchema"
23+
name="plone.menubar">
24+
<value purge="true">edit format insert table view</value>
25+
</record>
26+
27+
<record interface="plone.base.interfaces.controlpanel.ITinyMCESchema"
28+
name="plone.menu">
29+
<value purge="true">
30+
{
31+
"file": {
32+
"title": "File",
33+
"items": ""
34+
},
35+
"tools": {
36+
"title": "Tools",
37+
"items": ""
38+
},
39+
"edit": {
40+
"title": "Edit",
41+
"items": "undo redo | cut copy paste | searchreplace selectall"
42+
},
43+
"format": {
44+
"title": "Format",
45+
"items": ""
46+
},
47+
"insert": {
48+
"title": "Insert",
49+
"items": "hr"
50+
},
51+
"table": {
52+
"title": "Table",
53+
"items": "inserttable deletetable | cell row column"
54+
},
55+
"view": {
56+
"title": "View",
57+
"items": "visualblocks preview fullscreen"
58+
}
59+
}
60+
</value>
61+
</record>
62+
63+
<!-- See possible values in https://www.tiny.cloud/docs/tinymce/latest/available-toolbar-buttons/ -->
64+
<record interface="plone.base.interfaces.controlpanel.ITinyMCESchema"
65+
name="plone.toolbar"
66+
>
67+
<value>undo redo | styleselect | bold italic superscript | bullist numlist | nonbreaking | plonelink unlink | fullscreen</value>
68+
</record>
69+
70+
</registry>

0 commit comments

Comments
 (0)