Merge pull request #252 from nephila/feature/merge_250

Merge #250

djangocms_blog/cms_menus.py

@@ -125,7 +125,14 @@ class BlogNavModifier(Modifier):
         if app and app.app_config:
             namespace = resolve(request.path).namespace
             config = app.get_config(namespace)
-        if config and config.menu_structure != MENU_TYPE_CATEGORIES:
+        try:
+            if config and (
+                    not isinstance(config, BlogConfig) or
+                    config.menu_structure != MENU_TYPE_CATEGORIES
+            ):
+                return nodes
+        except AttributeError:  # pragma: no cover
+            # in case `menu_structure` is not present in config
             return nodes
         if post_cut:
             return nodes

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')}),