-
-
Notifications
You must be signed in to change notification settings - Fork 79
Expand file tree
/
Copy pathlast_commit.txt
More file actions
128 lines (79 loc) · 13.4 KB
/
Copy pathlast_commit.txt
File metadata and controls
128 lines (79 loc) · 13.4 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
Repository: plone.app.discussion
Branch: refs/heads/main
Date: 2026-06-17T16:27:44+02:00
Author: Mikel Larreategi (erral) <mlarreategi@codesyntax.com>
Commit: https://github.com/plone/plone.app.discussion/commit/2a6a8ee8005b8cbe6dbb245980eb24cb7a06c828
fix: change icon to the new style icons
Files changed:
M src/plone/app/discussion/profiles/default/actions.xml
b'diff --git a/src/plone/app/discussion/profiles/default/actions.xml b/src/plone/app/discussion/profiles/default/actions.xml\nindex 395f5e5e..995f443e 100644\n--- a/src/plone/app/discussion/profiles/default/actions.xml\n+++ b/src/plone/app/discussion/profiles/default/actions.xml\n@@ -17,7 +17,7 @@\n i18n:translate=""\n />\n <property name="url_expr">string:${globals_view/navigationRootUrl}/@@moderate-comments</property>\n- <property name="icon_expr">string:${globals_view/navigationRootUrl}/discussionitem_icon.png</property>\n+ <property name="icon_expr">string:chat</property>\n <property name="available_expr">portal/@@moderate-comments-enabled|nothing</property>\n <property name="permissions">\n <element value="Review comments" />\n'
Repository: plone.app.discussion
Branch: refs/heads/main
Date: 2026-06-17T16:28:02+02:00
Author: Mikel Larreategi (erral) <mlarreategi@codesyntax.com>
Commit: https://github.com/plone/plone.app.discussion/commit/94e6ce2a1aba7258641364077a275ec03909dee6
changelog
Files changed:
A news/+icon.bugfix
b'diff --git a/news/+icon.bugfix b/news/+icon.bugfix\nnew file mode 100644\nindex 00000000..13375649\n--- /dev/null\n+++ b/news/+icon.bugfix\n@@ -0,0 +1 @@\n+Use icon class name @erral\n'
Repository: plone.app.discussion
Branch: refs/heads/main
Date: 2026-07-03T07:23:36+02:00
Author: Mikel Larreategi (erral) <mlarreategi@codesyntax.com>
Commit: https://github.com/plone/plone.app.discussion/commit/bd4c96fc856304dcab18dc798e361e0ecdfa5616
add upgrade step
Files changed:
M src/plone/app/discussion/profiles/default/metadata.xml
M src/plone/app/discussion/upgrades.py
M src/plone/app/discussion/upgrades.zcml
b'diff --git a/src/plone/app/discussion/profiles/default/metadata.xml b/src/plone/app/discussion/profiles/default/metadata.xml\nindex 15f3d34a..a610db26 100644\n--- a/src/plone/app/discussion/profiles/default/metadata.xml\n+++ b/src/plone/app/discussion/profiles/default/metadata.xml\n@@ -1,6 +1,6 @@\n <?xml version="1.0" encoding="utf-8"?>\n <metadata>\n- <version>3000</version>\n+ <version>3001</version>\n <dependencies>\n <dependency>profile-plone.resource:default</dependency>\n <dependency>profile-plone.app.registry:default</dependency>\ndiff --git a/src/plone/app/discussion/upgrades.py b/src/plone/app/discussion/upgrades.py\nindex a60ef577..08e506cc 100644\n--- a/src/plone/app/discussion/upgrades.py\n+++ b/src/plone/app/discussion/upgrades.py\n@@ -1,11 +1,13 @@\n from .interfaces import IDiscussionSettings\n from .setuphandlers import add_discussion_behavior_to_default_types\n from datetime import timezone\n+from plone.base.utils import get_installer\n from plone.registry.interfaces import IRegistry\n from Products.CMFCore.utils import getToolByName\n from Products.ZCatalog.ProgressHandler import ZLogHandler\n from zope.component import getUtility\n \n+\n import logging\n \n default_profile = "profile-plone.app.discussion:default"\n@@ -119,3 +121,38 @@ def set_timezone_on_dates(context):\n def set_discussion_behavior(context):\n """Add the discussion behavior to all default types, if they exist."""\n add_discussion_behavior_to_default_types(context)\n+\n+\n+def manage_comments_icon(context):\n+ """if plone.app.discussion is installed, set the manage-comments action icon\n+ expression from its default to the bootstrap based new-style icons\n+ """\n+\n+ installer = get_installer(context)\n+ if not installer.is_product_installed("plone.app.discussion"):\n+ logger.info("plone.app.discussion is not installed. Nothing is done.")\n+ return\n+\n+ portal_actions = getToolByName(context, "portal_actions")\n+ user_actions = getattr(portal_actions, "user", None)\n+ if user_actions is None:\n+ logger.info("There are no user actions. Nothing is done.")\n+ return\n+\n+ review_comments_action = getattr(user_actions, "review-comments", None)\n+ if review_comments_action is None:\n+ logger.info("There is no manage comments action. Nothing is done.")\n+ return\n+\n+ # Check whether the action keeps its original state\n+ if (\n+ review_comments_action.icon_expr\n+ != "string:${globals_view/navigationRootUrl}/discussionitem_icon.png"\n+ ):\n+ logger.info(\n+ "Manage comments action icon was modified by the user. Nothing is done."\n+ )\n+ return\n+\n+ review_comments_action.icon_expr = "string:chat"\n+ logger.info("Manage comments action icon modified")\ndiff --git a/src/plone/app/discussion/upgrades.zcml b/src/plone/app/discussion/upgrades.zcml\nindex 129b73ee..c51717da 100644\n--- a/src/plone/app/discussion/upgrades.zcml\n+++ b/src/plone/app/discussion/upgrades.zcml\n@@ -132,4 +132,18 @@\n />\n </genericsetup:upgradeSteps>\n \n+\n+ <upgradeSteps\n+ destination="3001"\n+ profile="plone.app.discussion:default"\n+ source="3000"\n+ >\n+\n+ <upgradeStep\n+ title="Use Bootstrap style icon for discussion moderation action."\n+ handler=".upgrades.manage_comments_icon"\n+ />\n+\n+ </upgradeSteps>\n+\n </configure>\n'
Repository: plone.app.discussion
Branch: refs/heads/main
Date: 2026-07-03T07:30:02+02:00
Author: Mikel Larreategi (erral) <mlarreategi@codesyntax.com>
Commit: https://github.com/plone/plone.app.discussion/commit/60db927fc67dbb4f46047daefdf79d0edd36aa56
format
Files changed:
M src/plone/app/discussion/upgrades.py
b'diff --git a/src/plone/app/discussion/upgrades.py b/src/plone/app/discussion/upgrades.py\nindex 08e506cc..a3ef39eb 100644\n--- a/src/plone/app/discussion/upgrades.py\n+++ b/src/plone/app/discussion/upgrades.py\n@@ -7,7 +7,6 @@\n from Products.ZCatalog.ProgressHandler import ZLogHandler\n from zope.component import getUtility\n \n-\n import logging\n \n default_profile = "profile-plone.app.discussion:default"\n'
Repository: plone.app.discussion
Branch: refs/heads/main
Date: 2026-07-03T07:35:54+02:00
Author: Mikel Larreategi (erral) <mlarreategi@codesyntax.com>
Commit: https://github.com/plone/plone.app.discussion/commit/34b8a7df9c5a7649354374e936dfc66ff49cef3c
fix ZCML
Files changed:
M src/plone/app/discussion/upgrades.zcml
b'diff --git a/src/plone/app/discussion/upgrades.zcml b/src/plone/app/discussion/upgrades.zcml\nindex c51717da..801e64a7 100644\n--- a/src/plone/app/discussion/upgrades.zcml\n+++ b/src/plone/app/discussion/upgrades.zcml\n@@ -133,17 +133,17 @@\n </genericsetup:upgradeSteps>\n \n \n- <upgradeSteps\n- destination="3001"\n+ <genericsetup:upgradeSteps\n profile="plone.app.discussion:default"\n source="3000"\n+ destination="3001"\n >\n \n- <upgradeStep\n+ <genericsetup:upgradeStep\n title="Use Bootstrap style icon for discussion moderation action."\n handler=".upgrades.manage_comments_icon"\n />\n \n- </upgradeSteps>\n+ </genericsetup:upgradeSteps>\n \n </configure>\n'
Repository: plone.app.discussion
Branch: refs/heads/main
Date: 2026-07-06T07:58:31+02:00
Author: Mikel Larreategi (erral) <mlarreategi@codesyntax.com>
Commit: https://github.com/plone/plone.app.discussion/commit/86e3cfd34eaef233240fe704f9d53b9a89abd139
remove unneeded check of p.a.discussion being installed
Files changed:
M src/plone/app/discussion/upgrades.py
b'diff --git a/src/plone/app/discussion/upgrades.py b/src/plone/app/discussion/upgrades.py\nindex a3ef39eb..620bf30b 100644\n--- a/src/plone/app/discussion/upgrades.py\n+++ b/src/plone/app/discussion/upgrades.py\n@@ -127,11 +127,6 @@ def manage_comments_icon(context):\n expression from its default to the bootstrap based new-style icons\n """\n \n- installer = get_installer(context)\n- if not installer.is_product_installed("plone.app.discussion"):\n- logger.info("plone.app.discussion is not installed. Nothing is done.")\n- return\n-\n portal_actions = getToolByName(context, "portal_actions")\n user_actions = getattr(portal_actions, "user", None)\n if user_actions is None:\n'
Repository: plone.app.discussion
Branch: refs/heads/main
Date: 2026-07-06T08:02:18+02:00
Author: Mikel Larreategi (erral) <mlarreategi@codesyntax.com>
Commit: https://github.com/plone/plone.app.discussion/commit/e44baa1cfc5efb7f8ed8b780818c19bd63f3fe17
remove import
Files changed:
M src/plone/app/discussion/upgrades.py
b'diff --git a/src/plone/app/discussion/upgrades.py b/src/plone/app/discussion/upgrades.py\nindex 620bf30b..432e45f3 100644\n--- a/src/plone/app/discussion/upgrades.py\n+++ b/src/plone/app/discussion/upgrades.py\n@@ -1,7 +1,6 @@\n from .interfaces import IDiscussionSettings\n from .setuphandlers import add_discussion_behavior_to_default_types\n from datetime import timezone\n-from plone.base.utils import get_installer\n from plone.registry.interfaces import IRegistry\n from Products.CMFCore.utils import getToolByName\n from Products.ZCatalog.ProgressHandler import ZLogHandler\n'
Repository: plone.app.discussion
Branch: refs/heads/main
Date: 2026-07-06T12:34:37+02:00
Author: Mikel Larreategi (erral) <mlarreategi@codesyntax.com>
Commit: https://github.com/plone/plone.app.discussion/commit/358b70ceeeb20af3bcecc35149714d94c78f442f
Merge pull request #307 from plone/erral-icon
fix icon
Files changed:
A news/+icon.bugfix
M src/plone/app/discussion/profiles/default/actions.xml
M src/plone/app/discussion/profiles/default/metadata.xml
M src/plone/app/discussion/upgrades.py
M src/plone/app/discussion/upgrades.zcml
b'diff --git a/news/+icon.bugfix b/news/+icon.bugfix\nnew file mode 100644\nindex 00000000..13375649\n--- /dev/null\n+++ b/news/+icon.bugfix\n@@ -0,0 +1 @@\n+Use icon class name @erral\ndiff --git a/src/plone/app/discussion/profiles/default/actions.xml b/src/plone/app/discussion/profiles/default/actions.xml\nindex 395f5e5e..995f443e 100644\n--- a/src/plone/app/discussion/profiles/default/actions.xml\n+++ b/src/plone/app/discussion/profiles/default/actions.xml\n@@ -17,7 +17,7 @@\n i18n:translate=""\n />\n <property name="url_expr">string:${globals_view/navigationRootUrl}/@@moderate-comments</property>\n- <property name="icon_expr">string:${globals_view/navigationRootUrl}/discussionitem_icon.png</property>\n+ <property name="icon_expr">string:chat</property>\n <property name="available_expr">portal/@@moderate-comments-enabled|nothing</property>\n <property name="permissions">\n <element value="Review comments" />\ndiff --git a/src/plone/app/discussion/profiles/default/metadata.xml b/src/plone/app/discussion/profiles/default/metadata.xml\nindex 15f3d34a..a610db26 100644\n--- a/src/plone/app/discussion/profiles/default/metadata.xml\n+++ b/src/plone/app/discussion/profiles/default/metadata.xml\n@@ -1,6 +1,6 @@\n <?xml version="1.0" encoding="utf-8"?>\n <metadata>\n- <version>3000</version>\n+ <version>3001</version>\n <dependencies>\n <dependency>profile-plone.resource:default</dependency>\n <dependency>profile-plone.app.registry:default</dependency>\ndiff --git a/src/plone/app/discussion/upgrades.py b/src/plone/app/discussion/upgrades.py\nindex a60ef577..432e45f3 100644\n--- a/src/plone/app/discussion/upgrades.py\n+++ b/src/plone/app/discussion/upgrades.py\n@@ -119,3 +119,33 @@ def set_timezone_on_dates(context):\n def set_discussion_behavior(context):\n """Add the discussion behavior to all default types, if they exist."""\n add_discussion_behavior_to_default_types(context)\n+\n+\n+def manage_comments_icon(context):\n+ """if plone.app.discussion is installed, set the manage-comments action icon\n+ expression from its default to the bootstrap based new-style icons\n+ """\n+\n+ portal_actions = getToolByName(context, "portal_actions")\n+ user_actions = getattr(portal_actions, "user", None)\n+ if user_actions is None:\n+ logger.info("There are no user actions. Nothing is done.")\n+ return\n+\n+ review_comments_action = getattr(user_actions, "review-comments", None)\n+ if review_comments_action is None:\n+ logger.info("There is no manage comments action. Nothing is done.")\n+ return\n+\n+ # Check whether the action keeps its original state\n+ if (\n+ review_comments_action.icon_expr\n+ != "string:${globals_view/navigationRootUrl}/discussionitem_icon.png"\n+ ):\n+ logger.info(\n+ "Manage comments action icon was modified by the user. Nothing is done."\n+ )\n+ return\n+\n+ review_comments_action.icon_expr = "string:chat"\n+ logger.info("Manage comments action icon modified")\ndiff --git a/src/plone/app/discussion/upgrades.zcml b/src/plone/app/discussion/upgrades.zcml\nindex 129b73ee..801e64a7 100644\n--- a/src/plone/app/discussion/upgrades.zcml\n+++ b/src/plone/app/discussion/upgrades.zcml\n@@ -132,4 +132,18 @@\n />\n </genericsetup:upgradeSteps>\n \n+\n+ <genericsetup:upgradeSteps\n+ profile="plone.app.discussion:default"\n+ source="3000"\n+ destination="3001"\n+ >\n+\n+ <genericsetup:upgradeStep\n+ title="Use Bootstrap style icon for discussion moderation action."\n+ handler=".upgrades.manage_comments_icon"\n+ />\n+\n+ </genericsetup:upgradeSteps>\n+\n </configure>\n'