add extra parameter to generate userdirname base on user_id instead of username

This commit is contained in:
Jean-Baptiste Nallet 2014-08-14 18:12:36 +02:00
parent 3bfde78a0a
commit 7c59dec843
2 changed files with 4 additions and 1 deletions

View file

@ -17,6 +17,7 @@ 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

View file

@ -25,7 +25,9 @@ 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]
if settings.AVATAR_HASH_USERDIRNAMES:
if settings.AVATAR_USERID_HAS_USERDIRNAMES:
tmppath.append(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)])
else: