ungleich-public
/
public-health-ch
6
1
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Compare commits

base: ungleich-public:fc03ea59273385dbf06307e26a47253b90bde602
Branches Tags
ungleich-public:master
ungleich-public:11683-add-spotify-mp3
ungleich-public:10694-add-table-to-page
ungleich-public:10472/expiry-date-to-entry
ungleich-public:pro-salute
ungleich-public:loleg-wagtail-2.15
ungleich-public:test-menu
ungleich-public:2.0.0
...
compare: ungleich-public:e4a1cf5a77e9bcc0a3348ca72a3971988ebfde3e
Branches Tags
ungleich-public:11683-add-spotify-mp3
ungleich-public:master
ungleich-public:10694-add-table-to-page
ungleich-public:10472/expiry-date-to-entry
ungleich-public:pro-salute
ungleich-public:loleg-wagtail-2.15
ungleich-public:test-menu
ungleich-public:2.0.0

2 Commits
fc03ea5927 ... e4a1cf5a77

Author SHA1 Message Date
app e4a1cf5a77 Add migration 2023-05-16 11:49:32 +00:00
app fdfebf783e Converting richtext stream to str 2023-05-16 11:49:02 +00:00
3 changed files with 37 additions and 2 deletions
Show Stats Expand all files Collapse all files

2
publichealth/home/custom_filters.py
View File

@ -5,4 +5,4 @@ register = template.Library()
@register.filter
def ph_html_decode(value):
return unescape(value)
return unescape(str(value))

35
publichealth/home/migrations/0037_auto_20230516_1241.py Normal file
View File

@ -0,0 +1,35 @@
# Generated by Django 3.2.13 on 2023-05-16 10:41
from django.db import migrations
import wagtail.core.blocks
import wagtail.core.fields
import wagtail.images.blocks
class Migration(migrations.Migration):
dependencies = [
('home', '0036_auto_20230515_1556'),
]
operations = [
migrations.RemoveField(
model_name='articlepage',
name='html_content',
),
migrations.AlterField(
model_name='articlepage',
name='body_de',
field=wagtail.core.fields.StreamField([('paragraph', wagtail.core.blocks.RichTextBlock()), ('section', wagtail.core.blocks.CharBlock(form_classname='full title')), ('info', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock(required=False)), ('url', wagtail.core.blocks.URLBlock(required=False))], icon='help')), ('media', wagtail.core.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='media')), ('iframe', wagtail.core.blocks.RichTextBlock())], blank=True, null=True),
),
migrations.AlterField(
model_name='articlepage',
name='body_en',
field=wagtail.core.fields.StreamField([('paragraph', wagtail.core.blocks.RichTextBlock()), ('section', wagtail.core.blocks.CharBlock(form_classname='full title')), ('info', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock(required=False)), ('url', wagtail.core.blocks.URLBlock(required=False))], icon='help')), ('media', wagtail.core.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='media')), ('iframe', wagtail.core.blocks.RichTextBlock())], blank=True, null=True),
),
migrations.AlterField(
model_name='articlepage',
name='body_fr',
field=wagtail.core.fields.StreamField([('paragraph', wagtail.core.blocks.RichTextBlock()), ('section', wagtail.core.blocks.CharBlock(form_classname='full title')), ('info', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock(required=False)), ('url', wagtail.core.blocks.URLBlock(required=False))], icon='help')), ('media', wagtail.core.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='media')), ('iframe', wagtail.core.blocks.RichTextBlock())], blank=True, null=True),
),
]

2
publichealth/home/templates/home/page_content.html
View File

@ -25,7 +25,7 @@
{% endif %}
{% elif block.block_type == 'iframe' %}
{% autoescape off %}
{{ block.value|ph_html_decode }}
{{ block.value|richtext|ph_html_decode}}
{% endautoescape %}
{% elif block.block_type != 'info' %}
<p class="block-{{ block.block_type }}">