From 7c59dec843da987897a9966dcf671bb75e7d9d0d Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Nallet Date: Thu, 14 Aug 2014 18:12:36 +0200 Subject: [PATCH] add extra parameter to generate userdirname base on user_id instead of username --- avatar/conf.py | 1 + avatar/models.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/avatar/conf.py b/avatar/conf.py index 0379945..040bf32 100644 --- a/avatar/conf.py +++ b/avatar/conf.py @@ -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 diff --git a/avatar/models.py b/avatar/models.py index 7b76ac8..47ceb78 100644 --- a/avatar/models.py +++ b/avatar/models.py @@ -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: