Merge pull request #177 from dmarcelino/safer_slugurl

Make slugurl_trans tag resilient to missing request
This commit is contained in:
Alexandre Silva 2018-02-21 09:59:33 +00:00 committed by GitHub
commit 2135d7d081
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -9,8 +9,9 @@ from django.utils.translation import activate, get_language
from six import iteritems
from wagtail.wagtailcore.models import Page
from modeltranslation import settings as mt_settings
from wagtail.wagtailcore.templatetags.wagtailcore_tags import pageurl
from modeltranslation import settings as mt_settings
from modeltranslation.settings import DEFAULT_LANGUAGE
from ..contextlib import use_language
@ -80,11 +81,10 @@ def slugurl_trans(context, slug, language=None):
page = Page.objects.filter(slug=slug).first()
if page:
return page.relative_url(context['request'].site)
else:
return None
# call pageurl() instead of page.relative_url() here so we get the ``accepts_kwarg`` logic
return pageurl(context, page)
@register.tag('get_available_languages_wmt')
def do_get_available_languages(unused_parser, token):
"""