Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pass in file name to Thumbnailer when saving field with "resize_source" (issue #137) #167

Merged
merged 2 commits into from Dec 19, 2012
Merged

Pass in file name to Thumbnailer when saving field with "resize_source" (issue #137) #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c254a9a
Pass in file name to Thumbnailer when saving a field with "resize_sou…
selwin Sep 6, 2012
533bf28
Added test for saving ThumbnailerImageField with resize_options enabled.
selwin Sep 7, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion easy_thumbnails/files.py
View file
Open in desktop
Expand Up @@ -580,6 +580,6 @@ def save(self, name, content, *args, **kwargs):
if options:
if not 'quality' in options:
options['quality'] = self.thumbnail_quality
content = Thumbnailer(content).generate_thumbnail(options)
content = Thumbnailer(content, name).generate_thumbnail(options)
super(ThumbnailerImageFieldFile, self).save(name, content, *args,
**kwargs)
12 changes: 11 additions & 1 deletion easy_thumbnails/tests/fields.py
View file
Open in desktop
Expand Up @@ -4,12 +4,14 @@
from django.db import models

from easy_thumbnails import test
from easy_thumbnails.fields import ThumbnailerField
from easy_thumbnails.fields import ThumbnailerField, ThumbnailerImageField
from easy_thumbnails.exceptions import InvalidImageFormatError


class TestModel(models.Model):
avatar = ThumbnailerField(upload_to='avatars')
picture = ThumbnailerImageField(upload_to='pictures',
resize_source=dict(size=(10, 10)))


class ThumbnailerFieldTest(test.BaseTest):
Expand Down Expand Up @@ -76,3 +78,11 @@ def test_get_thumbnails(self):
instance.avatar.get_thumbnail({'size': (300, 300)})
instance.avatar.get_thumbnail({'size': (200, 200)})
self.assertEqual(len(list(instance.avatar.get_thumbnails())), 2)

def test_saving_image_field_with_resize_source(self):
# Ensure that saving ThumbnailerImageField with resize_source enabled
# using instance.field.save() does not fail
instance = TestModel(avatar='avatars/avatar.jpg')
instance.picture.save('file.jpg',
ContentFile(instance.avatar.file.read()))
self.assertEqual(instance.picture.width, 10)