From 429d6bd8f270fc9d13db48e6b659ba3a6b08ba69 Mon Sep 17 00:00:00 2001 From: Iacopo Spalletti Date: Fri, 13 May 2016 08:54:08 +0200 Subject: [PATCH] Minor addition --- djangocms_blog/cms_menus.py | 7 +++++-- tests/test_utils/admin.py | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/djangocms_blog/cms_menus.py b/djangocms_blog/cms_menus.py index af6f412..b105dfd 100644 --- a/djangocms_blog/cms_menus.py +++ b/djangocms_blog/cms_menus.py @@ -126,9 +126,12 @@ class BlogNavModifier(Modifier): namespace = resolve(request.path).namespace config = app.get_config(namespace) try: - if config and config.menu_structure != MENU_TYPE_CATEGORIES: + if config and ( + not isinstance(config, BlogConfig) or + config.menu_structure != MENU_TYPE_CATEGORIES + ): return nodes - except AttributeError: + except AttributeError: # pragma: no cover # in case `menu_structure` is not present in config return nodes if post_cut: diff --git a/tests/test_utils/admin.py b/tests/test_utils/admin.py index 3efd5fa..a48bd82 100644 --- a/tests/test_utils/admin.py +++ b/tests/test_utils/admin.py @@ -9,7 +9,6 @@ from .models import CustomUser class CustomUserAdmin(UserAdmin): model = CustomUser - fieldsets = ( (None, {'fields': ('username', 'password')}), (_('Personal info'), {'fields': ('first_name', 'last_name', 'email')}),