Hopiu/django-avatar
1
0
Fork 0
mirror of https://github.com/jazzband/django-avatar.git synced 2026-03-16 22:20:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Made the avatar tag a simple_tag again as it doesn't break backwards compatibility.

Browse source
This commit is contained in:
Jannis Leidel 2012-08-28 16:09:37 +02:00
parent c5042a8368
commit 3b6c77144e
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
avatar/templatetags/avatar_tags.py
View file

@ -1,6 +1,7 @@
import urllib
from django import template
from django.template.loader import render_to_string
from django.utils.translation import ugettext as _
from django.utils.hashcompat import md5_constructor
from django.core.urlresolvers import reverse
@ -34,8 +35,8 @@ def avatar_url(user, size=AVATAR_DEFAULT_SIZE):
@cache_result
@register.inclusion_tag('avatar/avatar_tag.html')
def avatar(user, size=AVATAR_DEFAULT_SIZE):
@register.simple_tag
def avatar(user, size=AVATAR_DEFAULT_SIZE, **kwargs):
if not isinstance(user, User):
try:
user = User.objects.get(username=user)
@ -47,12 +48,13 @@ def avatar(user, size=AVATAR_DEFAULT_SIZE):
else:
alt = unicode(user)
url = avatar_url(user, size)
return {
context = dict(kwargs, **{
'user': user,
'url': url,
'alt': alt,
'size': size,
}
})
return render_to_string('avatar/avatar_tag.html', context)
@register.filter

2
setup.py
View file

@ -1,6 +1,6 @@
from setuptools import setup, find_packages
version = '2.0a2'
version = '2.0a3'
LONG_DESCRIPTION = """
Using django-avatar