[8046] Update ckeditor5 django #2559

m4ra · 2024-02-28T16:17:45Z

This PR still is missing the ckeditor5 changes for assets/.jsx

TODO:

react documents
iframe migrations for organisation
iframe migration for offlineevent
iframe migration for interactiveevent

Tasks

PR name contains story or task reference
Documentation (docs and inline)
Tests (including n+1 and django_assert_num_queries where applicable)
Changelog

apps/organisations/forms.py

apps/documents/assets/ParagraphForm.jsx

apps/documents/templatetags/react_documents.py

tests/newsletters/test_newsletter_views.py

apps/organisations/forms.py

adhocracy-plus/config/settings/base.py

apps/documents/assets/ParagraphForm.jsx

apps/documents/templates/a4_candy_documents/chapter_detail.html

apps/topicprio/forms.py

docs/ckeditor.md

adhocracy-plus/assets/js/app.js

goapunk

the interactiveevents module needs updating as well and a migration for the iframes, similar to mb

apps/topicprio/forms.py

apps/organisations/migrations/0022_ckeditor_iframes.py

apps/organisations/forms.py

…ble*Field with CKEditor5Field"

m4ra · 2024-03-25T11:51:31Z

the interactiveevents module needs updating as well and a migration for the iframes, similar to mb

I don't exactly follow, there is no interactiveevent in mb. can you be more specific? @goapunk

goapunk · 2024-03-25T13:31:18Z

the interactiveevents module needs updating as well and a migration for the iframes, similar to mb

I don't exactly follow, there is no interactiveevent in mb. can you be more specific? @goapunk

ah, I think it's called livequestions in mb, but I did that already since I wrote that comment

apps/organisations/forms.py

m4ra · 2024-03-27T08:12:00Z

apps/organisations/forms.py

                field = field_cls(**kwargs)
+                # The CKEditor5Widget doesn't have a label field, so we need to set it
+                # after creating the object
+                if isinstance(field, CKEditor5Widget):


@goapunk shouldn't this check be against the CKEditor5Field instead of the widget?
ref https://github.com/liqd/django-ckeditor-5/blob/main/django_ckeditor_5/fields.py

oh, yes, and it should be CKEditor5Field above as well I guess

apps/organisations/forms.py

apps/organisations/migrations/0023_alter_organisationtranslation_information.py

apps/activities/migrations/0002_ckeditor_iframes.py

apps/offlineevents/migrations/0004_ckeditor_iframes.py

apps/organisations/forms.py

goapunk

Really nice!

m4ra changed the title ~~Update ckeditor5 django fields~~ [8046] Update ckeditor5 django Feb 28, 2024

m4ra requested a review from goapunk February 28, 2024 16:18

goapunk reviewed Feb 29, 2024

View reviewed changes

apps/organisations/forms.py Outdated Show resolved Hide resolved

goapunk reviewed Feb 29, 2024

View reviewed changes

apps/documents/assets/ParagraphForm.jsx Outdated Show resolved Hide resolved

m4ra force-pushed the mk-2024-02-ckeditor5-django branch 3 times, most recently from b777324 to 1cd0b1f Compare February 29, 2024 11:33

m4ra commented Feb 29, 2024

View reviewed changes

apps/documents/templatetags/react_documents.py Outdated Show resolved Hide resolved

m4ra commented Feb 29, 2024

View reviewed changes

tests/newsletters/test_newsletter_views.py Show resolved Hide resolved

m4ra commented Feb 29, 2024

View reviewed changes

apps/organisations/forms.py Show resolved Hide resolved

m4ra added 4 commits February 29, 2024 13:53

Update ckeditor5 django fields

4a2e29f

ckeditor5 django migrations

11d1991

assets: ckeditor5 js and style

5c8a3fe

docs, changelog: ckeditor

509b388

m4ra force-pushed the mk-2024-02-ckeditor5-django branch from 1cd0b1f to 509b388 Compare February 29, 2024 11:53

m4ra requested a review from goapunk February 29, 2024 11:59

goapunk reviewed Feb 29, 2024

View reviewed changes

adhocracy-plus/config/settings/base.py Outdated Show resolved Hide resolved

goapunk reviewed Feb 29, 2024

View reviewed changes

apps/documents/assets/ParagraphForm.jsx Outdated Show resolved Hide resolved

goapunk reviewed Feb 29, 2024

View reviewed changes

apps/documents/templates/a4_candy_documents/chapter_detail.html Outdated Show resolved Hide resolved

goapunk reviewed Feb 29, 2024

View reviewed changes

apps/topicprio/forms.py Outdated Show resolved Hide resolved

goapunk reviewed Feb 29, 2024

View reviewed changes

docs/ckeditor.md Outdated Show resolved Hide resolved

goapunk reviewed Feb 29, 2024

View reviewed changes

docs/ckeditor.md Outdated Show resolved Hide resolved

goapunk reviewed Feb 29, 2024

View reviewed changes

adhocracy-plus/assets/js/app.js Show resolved Hide resolved

goapunk requested changes Feb 29, 2024

View reviewed changes

goapunk added 3 commits March 13, 2024 09:36

ckeditor5: use user language

010c49f

FIXUP: add missing bracket back in

0139d60

FIXUP: fix urls

c58a806

goapunk reviewed Mar 13, 2024

View reviewed changes

apps/topicprio/forms.py Outdated Show resolved Hide resolved

goapunk reviewed Mar 25, 2024

View reviewed changes

apps/organisations/migrations/0022_ckeditor_iframes.py Outdated Show resolved Hide resolved

goapunk reviewed Mar 25, 2024

View reviewed changes

apps/organisations/forms.py Outdated Show resolved Hide resolved

goapunk added 4 commits March 25, 2024 13:22

fixup

817e4f1

FIXUP: add migrations for new iframe format, replace RichtextCollapsi…

05ec999

…ble*Field with CKEditor5Field"

apps/documents: adjust to new ckeditor5

2d1f7bb

apps/organisation: add migration for ckeditor iframes

9cc7bfb

m4ra force-pushed the mk-2024-02-ckeditor5-django branch from add30d7 to 95430a3 Compare March 26, 2024 13:35

m4ra commented Mar 27, 2024

View reviewed changes

apps/organisations/forms.py Outdated Show resolved Hide resolved

m4ra commented Mar 27, 2024

View reviewed changes

goapunk reviewed Mar 27, 2024

View reviewed changes

apps/organisations/forms.py Outdated Show resolved Hide resolved

goapunk reviewed Mar 27, 2024

View reviewed changes

apps/organisations/forms.py Outdated Show resolved Hide resolved

ideas,moderatorfeedback,organisations: replace richtext with ckeditor

4f1f118

m4ra force-pushed the mk-2024-02-ckeditor5-django branch from 95430a3 to 4f1f118 Compare March 27, 2024 14:14

m4ra requested a review from goapunk March 27, 2024 14:15

m4ra commented Mar 27, 2024

View reviewed changes

apps/organisations/migrations/0023_alter_organisationtranslation_information.py Outdated Show resolved Hide resolved

tests: fix E123 error

54c5bd9

goapunk reviewed Mar 28, 2024

View reviewed changes

apps/activities/migrations/0002_ckeditor_iframes.py Outdated Show resolved Hide resolved

goapunk reviewed Mar 28, 2024

View reviewed changes

apps/offlineevents/migrations/0004_ckeditor_iframes.py Outdated Show resolved Hide resolved

goapunk reviewed Mar 28, 2024

View reviewed changes

apps/organisations/forms.py Outdated Show resolved Hide resolved

migrations,assets: remove ck iframe migration and ck_embed_iframe.scss

b9551a5

goapunk approved these changes Mar 28, 2024

View reviewed changes

goapunk merged commit 36fab20 into main Mar 28, 2024
3 checks passed

goapunk deleted the mk-2024-02-ckeditor5-django branch March 28, 2024 10:59

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[8046] Update ckeditor5 django #2559

[8046] Update ckeditor5 django #2559

m4ra commented Feb 28, 2024 •

edited by goapunk

Loading

goapunk left a comment

m4ra commented Mar 25, 2024 •

edited

Loading

goapunk commented Mar 25, 2024

m4ra Mar 27, 2024

goapunk Mar 27, 2024

goapunk left a comment

[8046] Update ckeditor5 django #2559

[8046] Update ckeditor5 django #2559

Conversation

m4ra commented Feb 28, 2024 • edited by goapunk Loading

goapunk left a comment

Choose a reason for hiding this comment

m4ra commented Mar 25, 2024 • edited Loading

goapunk commented Mar 25, 2024

m4ra Mar 27, 2024

Choose a reason for hiding this comment

goapunk Mar 27, 2024

Choose a reason for hiding this comment

goapunk left a comment

Choose a reason for hiding this comment

m4ra commented Feb 28, 2024 •

edited by goapunk

Loading

m4ra commented Mar 25, 2024 •

edited

Loading