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

change to use AVATAR_HASH_USERDIRNAMES param even if AVATAR_USERID_HAS_USERDIRNAMES is True

Browse source
This commit is contained in:
Jean-Baptiste Nallet 2014-08-14 18:25:43 +02:00
parent c9c2e06fa1
commit fbb4e05d9d
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
avatar/models.py
View file

@ -25,13 +25,14 @@ avatar_storage = get_storage_class(settings.AVATAR_STORAGE)()
def avatar_file_path(instance=None, filename=None, size=None, ext=None):
tmppath = [settings.AVATAR_STORAGE_DIR]
userdirname = get_username(instance.user)
if settings.AVATAR_USERID_HAS_USERDIRNAMES:
tmppath.append(str(instance.user_id))
elif settings.AVATAR_HASH_USERDIRNAMES:
tmp = hashlib.md5(get_username(instance.user)).hexdigest()
tmppath.extend([tmp[0], tmp[1], get_username(instance.user)])
userdirname = str(instance.user_id)
if settings.AVATAR_HASH_USERDIRNAMES:
tmp = hashlib.md5(userdirname).hexdigest()
tmppath.extend([tmp[0], tmp[1], userdirname])
else:
tmppath.append(get_username(instance.user))
tmppath.append(userdirname)
if not filename:
# Filename already stored in database
filename = instance.avatar.name