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

Fix support for new filer ThumbnailOption

Browse source
This commit is contained in:
Iacopo Spalletti 2016-05-22 12:11:16 +02:00
commit fffc2a633e
No known key found for this signature in database
GPG key ID: BDCBC2EB289F60C6
5 changed files with 78 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tests/base.py
View file

@ -6,7 +6,6 @@ from copy import deepcopy
from django.contrib.auth import get_user_model
from django.contrib.sites.models import Site
from django.core.cache import cache
from django.core.management import call_command
from djangocms_helper.base_test import BaseTestCase
from haystack import connections
@ -14,12 +13,7 @@ from haystack.constants import DEFAULT_ALIAS
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
from djangocms_blog.models import BlogCategory, Post, ThumbnailOption
User = get_user_model()