ungleich-public/djangocms_blog
6
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #252 from nephila/feature/merge_250

Browse source 
Merge #250
This commit is contained in:
Iacopo Spalletti 2016-05-13 10:37:15 +02:00
commit 74fbf071df
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
djangocms_blog/cms_menus.py
View file

@ -125,7 +125,14 @@ class BlogNavModifier(Modifier):
if app and app.app_config: if app and app.app_config:
namespace = resolve(request.path).namespace namespace = resolve(request.path).namespace
config = app.get_config(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 return nodes
if post_cut: if post_cut:
return nodes return nodes

1
tests/test_utils/admin.py
View file

@ -9,7 +9,6 @@ from .models import CustomUser
class CustomUserAdmin(UserAdmin): class CustomUserAdmin(UserAdmin):
model = CustomUser model = CustomUser
fieldsets = ( fieldsets = (
(None, {'fields': ('username', 'password')}), (None, {'fields': ('username', 'password')}),
(_('Personal info'), {'fields': ('first_name', 'last_name', 'email')}), (_('Personal info'), {'fields': ('first_name', 'last_name', 'email')}),