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

Add some compatibility for cms menu and filer

Browse source
This commit is contained in:
Iacopo Spalletti 2016-04-29 10:12:41 +02:00
commit 6d74c26eed
No known key found for this signature in database
GPG key ID: BDCBC2EB289F60C6
3 changed files with 153 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tests/base.py
View file

@ -3,7 +3,6 @@ from __future__ import absolute_import, print_function, unicode_literals
from copy import deepcopy
from cmsplugin_filer_image.models import ThumbnailOption
from django.contrib.auth import get_user_model
from django.contrib.sites.models import Site
from django.core.cache import cache
@ -15,6 +14,13 @@ from parler.utils.context import smart_override
from djangocms_blog.cms_appconfig import BlogConfig
from djangocms_blog.models import BlogCategory, Post
try:
from filer.models import ThumbnailOption # NOQA
except ImportError:
from cmsplugin_filer_image.models import ThumbnailOption # NOQA
User = get_user_model()