Compare commits
4 Commits
0.15.2
...
dependabot
Author | SHA1 | Date | |
---|---|---|---|
4eb5c2fe15 | |||
dd4530203f | |||
48955675be | |||
a81c5b3560 |
25
CHANGES
25
CHANGES
@ -1,3 +1,28 @@
|
|||||||
|
0.15.3
|
||||||
|
=================
|
||||||
|
- Add wagtail >= 2.15 support with get_context_data override instead of get_context
|
||||||
|
|
||||||
|
0.15.2
|
||||||
|
=================
|
||||||
|
- Replace staticfiles tag with static
|
||||||
|
|
||||||
|
0.15.1
|
||||||
|
=================
|
||||||
|
- Remove old versions from test matrix
|
||||||
|
- Fix button support in wagtail admin for newer wagtail versions
|
||||||
|
|
||||||
|
0.15.0
|
||||||
|
=================
|
||||||
|
- Fix is_authenticated 'bool' object is not callable error
|
||||||
|
- Add wagtail <=2.11 support
|
||||||
|
- Use Github Actions to test package instead of Travis CI
|
||||||
|
|
||||||
|
0.14.0
|
||||||
|
=================
|
||||||
|
- Fix 'bool' object is not callable error
|
||||||
|
- Fix deleting descendants with variants when deleting a page
|
||||||
|
- Add wagtail 2.6 support
|
||||||
|
|
||||||
0.13.0
|
0.13.0
|
||||||
=================
|
=================
|
||||||
- Merged Praekelt fork
|
- Merged Praekelt fork
|
||||||
|
@ -62,10 +62,10 @@ author = 'Lab Digital BV'
|
|||||||
# built documents.
|
# built documents.
|
||||||
#
|
#
|
||||||
# The short X.Y version.
|
# The short X.Y version.
|
||||||
version = '0.15.2'
|
version = '0.15.3'
|
||||||
|
|
||||||
# The full version, including alpha/beta/rc tags.
|
# The full version, including alpha/beta/rc tags.
|
||||||
release = '0.15.2'
|
release = '0.15.3'
|
||||||
|
|
||||||
# The language for content autogenerated by Sphinx. Refer to documentation
|
# The language for content autogenerated by Sphinx. Refer to documentation
|
||||||
# for a list of supported languages.
|
# for a list of supported languages.
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
[bumpversion]
|
[bumpversion]
|
||||||
current_version = 0.15.2
|
current_version = 0.15.3
|
||||||
commit = true
|
commit = true
|
||||||
tag = true
|
tag = true
|
||||||
tag_name = {new_version}
|
tag_name = {new_version}
|
||||||
|
2
setup.py
2
setup.py
@ -35,7 +35,7 @@ with open('README.rst') as fh:
|
|||||||
|
|
||||||
setup(
|
setup(
|
||||||
name='wagtail-personalisation',
|
name='wagtail-personalisation',
|
||||||
version='0.15.2',
|
version='0.15.3',
|
||||||
description='A Wagtail add-on for showing personalized content',
|
description='A Wagtail add-on for showing personalized content',
|
||||||
author='Lab Digital BV and others',
|
author='Lab Digital BV and others',
|
||||||
author_email='opensource@labdigital.nl',
|
author_email='opensource@labdigital.nl',
|
||||||
|
@ -9,6 +9,7 @@ from django.template.defaultfilters import pluralize
|
|||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
from django.utils.safestring import mark_safe
|
from django.utils.safestring import mark_safe
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
|
from wagtail import VERSION as WAGTAIL_VERSION
|
||||||
from wagtail.admin import messages
|
from wagtail.admin import messages
|
||||||
from wagtail.admin.site_summary import PagesSummaryItem, SummaryItem
|
from wagtail.admin.site_summary import PagesSummaryItem, SummaryItem
|
||||||
|
|
||||||
@ -192,12 +193,11 @@ def page_listing_more_buttons(page, page_perms, is_parent=False, *args):
|
|||||||
|
|
||||||
|
|
||||||
class CorrectedPagesSummaryItem(PagesSummaryItem):
|
class CorrectedPagesSummaryItem(PagesSummaryItem):
|
||||||
def get_context(self):
|
def get_total_pages(self, context):
|
||||||
# Perform the same check as Wagtail to get the correct count.
|
# Perform the same check as Wagtail to get the correct count.
|
||||||
# Only correct the count when a root page is available to the user.
|
# Only correct the count when a root page is available to the user.
|
||||||
# The `PagesSummaryItem` will return a page count of 0 otherwise.
|
# The `PagesSummaryItem` will return a page count of 0 otherwise.
|
||||||
# https://github.com/wagtail/wagtail/blob/5c9ff23e229acabad406c42c4e13cbaea32e6c15/wagtail/admin/site_summary.py#L38
|
# https://github.com/wagtail/wagtail/blob/5c9ff23e229acabad406c42c4e13cbaea32e6c15/wagtail/admin/site_summary.py#L38
|
||||||
context = super().get_context()
|
|
||||||
root_page = context.get("root_page", None)
|
root_page = context.get("root_page", None)
|
||||||
if root_page:
|
if root_page:
|
||||||
pages = utils.exclude_variants(
|
pages = utils.exclude_variants(
|
||||||
@ -208,9 +208,18 @@ class CorrectedPagesSummaryItem(PagesSummaryItem):
|
|||||||
if root_page.is_root():
|
if root_page.is_root():
|
||||||
page_count -= 1
|
page_count -= 1
|
||||||
|
|
||||||
context["total_pages"] = page_count
|
return page_count
|
||||||
|
|
||||||
return context
|
if WAGTAIL_VERSION >= (2, 15):
|
||||||
|
def get_context_data(self, parent_context):
|
||||||
|
context = super().get_context_data(parent_context)
|
||||||
|
context["total_pages"] = self.get_total_pages(context)
|
||||||
|
return context
|
||||||
|
else:
|
||||||
|
def get_context(self):
|
||||||
|
context = super().get_context()
|
||||||
|
context["total_pages"] = self.get_total_pages(context)
|
||||||
|
return context
|
||||||
|
|
||||||
|
|
||||||
@hooks.register("construct_homepage_summary_items")
|
@hooks.register("construct_homepage_summary_items")
|
||||||
|
12
yarn.lock
12
yarn.lock
@ -307,9 +307,9 @@ async-throttle@^1.1.0:
|
|||||||
integrity sha1-Ip5/P6eip5fobzYOYwmggiTU+no=
|
integrity sha1-Ip5/P6eip5fobzYOYwmggiTU+no=
|
||||||
|
|
||||||
async@^2.1.2:
|
async@^2.1.2:
|
||||||
version "2.6.3"
|
version "2.6.4"
|
||||||
resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
|
resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221"
|
||||||
integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
|
integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==
|
||||||
dependencies:
|
dependencies:
|
||||||
lodash "^4.17.14"
|
lodash "^4.17.14"
|
||||||
|
|
||||||
@ -4953,9 +4953,9 @@ lodash.uniq@^4.5.0:
|
|||||||
integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
|
integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
|
||||||
|
|
||||||
lodash@^4.0.0, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0, lodash@~4.17.10, lodash@~4.17.11:
|
lodash@^4.0.0, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0, lodash@~4.17.10, lodash@~4.17.11:
|
||||||
version "4.17.15"
|
version "4.17.21"
|
||||||
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
|
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
|
||||||
integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
|
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
|
||||||
|
|
||||||
logalot@^2.0.0:
|
logalot@^2.0.0:
|
||||||
version "2.1.0"
|
version "2.1.0"
|
||||||
|
Reference in New Issue
Block a user