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

Merge pull request #16 from tbabej/revert-15-master

Browse source 
Revert "Add an extra param to use user_id as userdirname instead of user...
This commit is contained in:
Tomas Babej 2014-08-14 23:52:35 +02:00
commit a55a52aec6
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
avatar/conf.py
View file

@ -17,7 +17,6 @@ class AvatarConf(AppConf):
MAX_SIZE = 1024 * 1024
THUMB_FORMAT = 'JPEG'
THUMB_QUALITY = 85
USERID_HAS_USERDIRNAMES = False
HASH_FILENAMES = False
HASH_USERDIRNAMES = False
ALLOWED_FILE_EXTS = None

9
avatar/models.py
View file

@ -25,14 +25,11 @@ 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:
userdirname = str(instance.user_id)
if settings.AVATAR_HASH_USERDIRNAMES:
tmp = hashlib.md5(userdirname).hexdigest()
tmppath.extend([tmp[0], tmp[1], userdirname])
tmp = hashlib.md5(get_username(instance.user)).hexdigest()
tmppath.extend([tmp[0], tmp[1], get_username(instance.user)])
else:
tmppath.append(userdirname)
tmppath.append(get_username(instance.user))
if not filename:
# Filename already stored in database
filename = instance.avatar.name