diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 409f8506cf..b101607eb2 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,6 +19,7 @@ Changelog * Fix: Fixed incorrect CSS path on ModelAdmin's "choose a parent page" view * Fix: Prevent empty redirect by overnormalisation (Franklin Kingma, Ludolf Takens) * Fix: "Remove link" button in rich text editor didn't trigger "edit" event, leading to the change to sometimes not be persisted (Matt Westcott) + * Fix: `RichText` values can now be correctly evaluated as booleans (Mike Dingjan, Bertrand Bordage) 1.5.2 (08.06.2016) diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index 0b2c4477db..b04ddc6ff5 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -146,6 +146,7 @@ Contributors * Franklin Kingma * Ludolf Takens * Oktay Altay +* Bertrand Bordage Translators =========== diff --git a/docs/releases/1.6.rst b/docs/releases/1.6.rst index 9934e055e1..5d1798688d 100644 --- a/docs/releases/1.6.rst +++ b/docs/releases/1.6.rst @@ -34,6 +34,7 @@ Bug fixes * Fixed incorrect CSS path on ModelAdmin's "choose a parent page" view * Prevent empty redirect by overnormalisation * "Remove link" button in rich text editor didn't trigger "edit" event, leading to the change to sometimes not be persisted (Matt Westcott) + * ``RichText`` values can now be correctly evaluated as booleans (Mike Dingjan, Bertrand Bordage) Upgrade considerations diff --git a/wagtail/wagtailcore/rich_text.py b/wagtail/wagtailcore/rich_text.py index a3d106c6a0..9f258998a5 100644 --- a/wagtail/wagtailcore/rich_text.py +++ b/wagtail/wagtailcore/rich_text.py @@ -195,3 +195,7 @@ class RichText(object): def __str__(self): return mark_safe('
Merry Christmas!
wagtail
') + self.assertTrue(value)