Skip to content

Conversation

@szakitibi
Copy link

Fixes #86.

Similar to #83 it will also require:

  1. plone.app.upgrade upgrade step to replace existing values for TinyMCE toolbar and menu format settings in registry and to pop removed plugins too from plugins list.
  2. plone.staticresources update to cleanup the temporary fix plone/mockup@eac9e4b.

@mister-roboto
Copy link

Tibor Szakmany the email address in your commit does not match an email in your GitHub account. Thus it is impossible to determine whether you have signed the Plone Contributor Agreement, which is required to merge this pull request.

Learn about the Plone Contributor Agreement: https://plone.org/foundation/contributors-agreement

If you have sent in your Plone Contributor Agreement, and received and accepted an invitation to join the Plone GitHub organization, then you might need to either add the email address on your Agreement to your GitHub account or change the email address in your commits. If you need to do the latter, then you should squash the commits with your matching email and push them.

Add more emails to your GitHub account:
https://docs.github.com/en/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/adding-an-email-address-to-your-github-account

Change the email address in your commits:
https://docs.github.com/en/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/setting-your-commit-email-address

@mister-roboto
Copy link

@szakitibi thanks for creating this Pull Request and helping to improve Plone!

TL;DR: Finish pushing changes, pass all other checks, then paste a comment:

@jenkins-plone-org please run jobs

To ensure that these changes do not break other parts of Plone, the Plone test suite matrix needs to pass, but it takes 30-60 min. Other CI checks are usually much faster and the Plone Jenkins resources are limited, so when done pushing changes and all other checks pass either start all Jenkins PR jobs yourself, or simply add the comment above in this PR to start all the jobs automatically.

Happy hacking!

@szakitibi
Copy link
Author

Might worth adding license_key also as setting with default gpl value instead of hardcoding it - see here. I think currently it is not possible to change it to a commercial license.

@thet
Copy link
Member

thet commented Sep 24, 2025

@szakitibi hi, sorry, I‌ totally missed your PR. In the meantime it was already fixed with this one: #92 - just one after yours.

I have rebased your changes on top of the plone.base main branch and it now contains only the TinyMCE 7 setting changes.

To get this fixed you still need to sign the contributors agreement.

@stevepiercy
Copy link
Contributor

@thet @szakitibi has signed the PCA after submitting this PR. Either closing and reopening this PR, or pushing a commit to it, will trigger the check.

However, there are merge conflicts that @szakitibi would first need to resolve.

@mister-roboto
Copy link

Tibor Szakmany the email address in your commit does not match an email in your GitHub account. Thus it is impossible to determine whether you have signed the Plone Contributor Agreement, which is required to merge this pull request.

Learn about the Plone Contributor Agreement: https://plone.org/foundation/contributors-agreement

If you have sent in your Plone Contributor Agreement, and received and accepted an invitation to join the Plone GitHub organization, then you might need to either add the email address on your Agreement to your GitHub account or change the email address in your commits. If you need to do the latter, then you should squash the commits with your matching email and push them.

Add more emails to your GitHub account:
https://docs.github.com/en/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/adding-an-email-address-to-your-github-account

Change the email address in your commits:
https://docs.github.com/en/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/setting-your-commit-email-address

@szakitibi
Copy link
Author

However, there are merge conflicts that @szakitibi would first need to resolve.

@thet I did resolve the conflicts, but the changes left are minimal, @petschki did all the hard work already in #92 👏.

As I mentioned in the description above, these minimal changes would still have to have their matching changes in plone.app.upgrade and plone.mockup - similar to #83, #92.

@thet @szakitibi has signed the PCA after submitting this PR.

I signed it long time ago. 🤔 However I pushed commit 46b09a6 by accident from a local clone with work email. 😞 Seems like this is the reason for the PCA check failure.

Probably the best course of action would be if @petschki adds the suggested changes to all 3 affected products similar to #92. He has access to all 3 and knows his way around them. The suggested changes are:

  1. Update menu and toolbar in ITinyMCEPluginSchema - see b94020e, plus related plone.app.upgrade changes. Then it would be possible to get rid of the almost 2 year old "temporary fix" plone/mockup@eac9e4b.
  2. Adding licence_key setting with default gpl value instead of hard-coding it here. It is not possible to change it to a commercial license. Maybe some Universities would like to use some professional plugins like TinyMCE Math.

Then this PR can be closed without a merge.

@petschki
Copy link
Member

Am I correct, that the main branch here is targeting 4.0.x release and therefore Plone 6.2 only ? I'm fine with that, since I'm thinking about updateing TinyMCE to version 8 for Plone 6.2 ... we could then cleanup the toolbar name and make the license configurable there too. Regarding plone.app.upgrade: I can prepare a toolbar name fix but then again also for 6.2 only ...

/cc @mauritsvanrees

@mauritsvanrees
Copy link
Member

@petschki Yes, the main branch is for 6.2 only.

@petschki
Copy link
Member

closing this in favor of #93

@petschki petschki closed this Sep 30, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

TinyMCE settings are outdated

6 participants