Skip to content

Wagtail upgrade #412

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

Closed
rcoldiron wants to merge 3 commits into from
Closed

Wagtail upgrade #412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee0d023
WIP - upgrading wagtail, temporary version number
Mar 12, 2021
53ac716
updated wagtail requirement, included unidecode which was being flagg…
Mar 15, 2021
d7f795a
removed unidecode, added anyascii
Mar 15, 2021
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
2 changes: 1 addition & 1 deletion coderedcms/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

See: https://www.python.org/dev/peps/pep-0440/
"""
release = ["0", "20", "0", "", ""]
release = ["0", "20", "0", "dev2", ""]


def _get_version() -> str:
Expand Down
4 changes: 2 additions & 2 deletions coderedcms/wagtail_flexible_forms/blocks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from django.utils.dateparse import parse_datetime
from django.utils.text import slugify
from django.utils.translation import gettext_lazy as _
from unidecode import unidecode
from anyascii import anyascii
from wagtail.core.blocks import (
StructBlock, TextBlock, CharBlock, BooleanBlock, ListBlock, StreamBlock,
DateBlock, TimeBlock, DateTimeBlock, ChoiceBlock, RichTextBlock,
Expand All @@ -18,7 +18,7 @@ class FormFieldBlock(StructBlock):
widget = None

def get_slug(self, struct_value):
return slugify(unidecode(struct_value['field_label']))
return slugify(anyascii(struct_value['field_label']))

def get_field_class(self, struct_value):
return self.field_class
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
'Django>=2.2,<3.2', # should be the same as wagtail
'geocoder==1.38.*',
'icalendar==4.0.*',
'wagtail==2.11.*',
'wagtail==2.12.*',
'wagtailfontawesome>=1.2.*',
'wagtail-cache==1.*',
'wagtail-import-export>=0.2,<0.3'
Expand Down