8000 chore: Move from script tags containing dom elements to template tags by fsbraun · Pull Request #8233 · django-cms/django-cms · GitHub
[go: up one dir, main page]
Skip to content

chore: Move from script tags containing dom elements to template tags #8233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 19 commits into from
May 21, 2025
Merged

chore: Move from script tags containing dom elements to template tags #8233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
5dcfaee
[5.1.0dev1 release process] Bumped version to 5.1.0dev1
May 12, 2025
0e66eb1
[5.1.0dev1 release process] compilemessages
May 12, 2025
f62dc80
[5.1.0dev1 release process] compiling new static files
May 12, 2025
2e61493
[5.1.0dev1 release process] updating latest docs
May 12, 2025
e73c887
Prepare new main branch
fsbraun May 12, 2025
752eee1
Fix typos
fsbraun May 12, 2025
0df9391
fix: No changes to changelog
fsbraun May 12, 2025
4bc36a1
fix: Remove unnecessary change to migration
fsbraun May 12, 2025
339e8c2
Remove circular import
fsbraun May 12, 2025
d31bcd2
Fix import order
fsbraun May 13, 2025
29860d1
Re-introduce dummy `PlaceholderField` for legacy migrations
fsbraun May 13, 2025
d1e5a3a
fix: Do not assume page url cache to be filled
fsbraun May 13, 2025
06e531a
fix: Structure board update sometimes failed to add all interactive e…
fsbraun May 14, 2025
4e764b9
fix: Update assets
fsbraun May 14, 2025
73feff6
fix: Empty plugin selectors in all but first placeholder
fsbraun May 14, 2025
a219785
chore: Move from script tags containing dom elements to template tags
fsbraun May 14, 2025
eb717cf
Merge branch 'main' into chore/script2template
fsbraun May 21, 2025
222cc27
Update cms/models/fields.py
fsbraun May 21, 2025
eb5b165
Update cms/models/fields.py
fsbraun May 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions cms/plugin_rendering.py
View file
Open in desktop
8000
Original file line number Diff line number Diff line change
Expand Up @@ -726,9 +726,9 @@ def _preload_placeholders_for_page(self, page, slots=None, inherit=False):
class StructureRenderer(BaseRenderer):
load_structure = True
placeholder_edit_template = """
<script data-cms id="cms-plugin-child-classes-{placeholder_id}" type="text/cms-template">
<template data-cms id="cms-plugin-child-classes-{placeholder_id}" type="text/cms-template">
{plugin_menu_js}
</script>
</template>
{plugin_js}{placeholder_js}
"""

Expand Down Expand Up @@ -794,9 +794,9 @@ class LegacyRenderer(ContentRenderer):
placeholder_edit_template = """
{content}
<div class="cms-placeholder cms-placeholder-{placeholder_id}"></div>
<script data-cms id="cms-plugin-child-classes-{placeholder_id}" type="text/cms-template">
<template data-cms id="cms-plugin-child-classes-{placeholder_id}" type="text/cms-template">
{plugin_menu_js}
</script>
</template>
{plugin_js}{placeholder_js}
"""

Expand Down
4 changes: 2 additions & 2 deletions cms/tests/frontend/unit/fixtures/plugin_child_classes.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<script id="cms-plugin-child-classes-1" type="text/cms-template">
<template id="cms-plugin-child-classes-1" type="text/cms-template">
<div class="cms-submenu-item cms-submenu-item-title"><span>Accordion</span></div>
<div class="cms-submenu-item"><a data-rel="add" href="Bootstrap3AccordionItemCMSPlugin">Accordion item</a></div>
<div class="cms-submenu-item cms-submenu-item-title"><span>Bootstrap3</span></div>
Expand Down Expand Up @@ -81,4 +81,4 @@
<div class="cms-submenu-item"><a data-rel="add" href="NewsBlogTagsPlugin">Tags</a></div>
<div class="cms-submenu-item cms-submenu-item-title"><span>People</span></div>
<div class="cms-submenu-item"><a data-rel="add" href="PeoplePlugin">People list</a></div>
</script>
</template>
4 changes: 2 additions & 2 deletions cms/tests/test_placeholder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1014,7 +1014,7 @@ def test_sets_source_when_external_object_is_rendered(self):
for placeholder in declared_placeholders:
self.assertContains(
response,
'<script data-cms id="cms-plugin-child-classes-%s" type="text/cms-template">'
'<template data-cms id="cms-plugin-child-classes-%s" type="text/cms-template">'
% placeholders.get(slot=placeholder.slot).pk,
)

Expand All @@ -1037,7 +1037,7 @@ def test_sets_source_when_external_object_is_rendered(self):
for placeholder in declared_placeholders:
self.assertContains(
response,
'<script data-cms id="cms-plugin-child-classes-%s" type="text/cms-template">'
'<template data-cms id="cms-plugin-child-classes-%s" type="text/cms-template">'
% placeholders.get(slot=placeholder.slot).pk,
)

Expand Down
Loading
0