Skip to content
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.

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

Do not fail if request is not in context #70

Merged
merged 1 commit into from
May 6, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 7 additions & 2 deletions djangocms_page_meta/templatetags/page_meta_tags.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from classytags.core import Options, Tag
from cms.utils import get_language_from_request
from django import template
from meta.views import Meta

from ..utils import get_page_meta

Expand All @@ -20,8 +21,12 @@ class MetaFromPage(Tag):
)

def render_tag(self, context, page, varname):
language = get_language_from_request(context['request'])
meta = get_page_meta(page, language)
request = context.get('request')
if request:
language = get_language_from_request(request)
meta = get_page_meta(page, language)
else:
meta = Meta()
context[varname] = meta
return ''
register.tag(MetaFromPage)
16 changes: 16 additions & 0 deletions tests/test_general.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,33 @@

from copy import copy

from classytags.core import Options
from classytags.tests import DummyTokens
from django.conf import settings
from django.template.base import Parser
from django.utils.functional import SimpleLazyObject

from djangocms_page_meta import models
from djangocms_page_meta.templatetags.page_meta_tags import MetaFromPage
from djangocms_page_meta.utils import get_page_meta

from . import BaseTest


class PageMetaUtilsTest(BaseTest):

def test_context_no_request(self):
"""
This is a weird and limited test to ensure that if request is not in context
no exception is thrown. In this case MetaFromPage.render_tag does not need
a full environment to work
"""
context = {}
dummy_tokens = DummyTokens('myval', 'as', 'myname')
tag = MetaFromPage.render_tag(MetaFromPage(Parser(dummy_tokens), dummy_tokens), context, None, 'meta')
self.assertFalse(tag)
self.assertTrue(context['meta'])

def test_page_meta_og(self):
"""
Tests the OpenGraph meta tags
Expand Down