Skip to content

don't crash if no page extensions are registered, issue a warning instead. #386

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
andrinheusser wants to merge 1 commit into from
Closed

don't crash if no page extensions are registered, issue a warning instead. #386

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
56 changes: 32 additions & 24 deletions feincms/module/page/templatetags/feincms_page_tags.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,33 +87,41 @@ def _filter(iterable):

queryset = _filter(queryset)

if any((ext in feincms_page._feincms_extensions for ext in (
'navigation', 'feincms.module.page.extensions.navigation'))):
# Filter out children of nodes which have a navigation extension
extended_node_rght = [] # mptt node right value
try:
if any((ext in feincms_page._feincms_extensions for ext in (
'navigation', 'feincms.module.page.extensions.navigation'))):
# Filter out children of nodes which have a navigation extension
extended_node_rght = [] # mptt node right value

def _filter(iterable):
for elem in iterable:
if extended_node_rght:
if getattr(elem, mptt_opts.right_attr) < extended_node_rght[-1]:
# Still inside some navigation extension
continue
else:
extended_node_rght.pop()

if getattr(elem, 'navigation_extension', None):
yield elem
extended_node_rght.append(getattr(elem, mptt_opts.right_attr))

for extended in elem.extended_navigation(depth=depth,
request=context.get('request')):
if getattr(extended, mptt_opts.level_attr, 0) < level + depth - 1:
yield extended

def _filter(iterable):
for elem in iterable:
if extended_node_rght:
if getattr(elem, mptt_opts.right_attr) < extended_node_rght[-1]:
# Still inside some navigation extension
continue
else:
extended_node_rght.pop()

if getattr(elem, 'navigation_extension', None):
yield elem
extended_node_rght.append(getattr(elem, mptt_opts.right_attr))
yield elem

for extended in elem.extended_navigation(depth=depth,
request=context.get('request')):
if getattr(extended, mptt_opts.level_attr, 0) < level + depth - 1:
yield extended

else:
yield elem

queryset = _filter(queryset)
queryset = _filter(queryset)
except AttributeError:
warnings.warn(
Copy link
Copy Markdown
Member

@matthiask matthiask Feb 15, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's too much code inside a try..except clause. Smaller bugfix arriving in xx minutes...

'''
The Page Object is missing the _feincms_extensions attribute.
Even if you dont need no extensions,
please add a Page.register_extensions() call.
''', Warning, stacklevel=3)

# Return a list, not a generator so that it can be consumed
# several times in a template.
Expand Down