Skip to content

AdminThumbnail: Use source from generator if image_field is a function #577

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

AdminThumbnail: Use source from generator if image_field is a function #577

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion imagekit/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,19 @@ def __init__(self, image_field, template=None):
def __call__(self, obj):
if callable(self.image_field):
thumbnail = self.image_field(obj)
generator = getattr(thumbnail, 'generator', None)
if generator:
original_image = getattr(generator, 'source', thumbnail)
else:
original_image = thumbnail
else:
try:
thumbnail = getattr(obj, self.image_field)
original_image = getattr(thumbnail, 'source', None) or thumbnail
except AttributeError:
raise Exception('The property %s is not defined on %s.' %
(self.image_field, obj.__class__.__name__))

original_image = getattr(thumbnail, 'source', None) or thumbnail
template = self.template or 'imagekit/admin/thumbnail.html'

return render_to_string(template, {
Expand Down
Loading