mirror of
https://github.com/Hopiu/django-imagekit.git
synced 2026-03-16 21:30:23 +00:00
Sourceless specs are falsy
Passes test added in 190153d. Related to #187
This commit is contained in:
parent
190153d068
commit
b33869a9f8
2 changed files with 7 additions and 3 deletions
|
|
@ -27,10 +27,12 @@ class ImageCacheFile(BaseIKFile, ImageFile):
|
|||
"""
|
||||
self.generator = generator
|
||||
|
||||
name = name or getattr(generator, 'cachefile_name', None)
|
||||
if not name:
|
||||
fn = get_by_qname(settings.IMAGEKIT_CACHEFILE_NAMER, 'namer')
|
||||
name = fn(generator)
|
||||
try:
|
||||
name = generator.cachefile_name
|
||||
except AttributeError:
|
||||
fn = get_by_qname(settings.IMAGEKIT_CACHEFILE_NAMER, 'namer')
|
||||
name = fn(generator)
|
||||
self.name = name
|
||||
|
||||
storage = storage or getattr(generator, 'cachefile_storage',
|
||||
|
|
|
|||
|
|
@ -82,6 +82,8 @@ class ImageSpec(BaseImageSpec):
|
|||
|
||||
@property
|
||||
def cachefile_name(self):
|
||||
if not self.source:
|
||||
return None
|
||||
fn = get_by_qname(settings.IMAGEKIT_SPEC_CACHEFILE_NAMER, 'namer')
|
||||
return fn(self)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue