diff --git a/seahub/avatar/templatetags/avatar_tags.py b/seahub/avatar/templatetags/avatar_tags.py index afdc27a803..4a6423d4de 100644 --- a/seahub/avatar/templatetags/avatar_tags.py +++ b/seahub/avatar/templatetags/avatar_tags.py @@ -54,7 +54,7 @@ def avatar(user, size=AVATAR_DEFAULT_SIZE): if not isinstance(user, User): try: user = User.objects.get(email=user) - url = avatar_url(user, size) + url = avatar_url(user, size*2) except User.DoesNotExist: url = get_default_avatar_non_registered_url() except Exception as e: @@ -63,7 +63,7 @@ def avatar(user, size=AVATAR_DEFAULT_SIZE): url = get_default_avatar_non_registered_url() else: try: - url = avatar_url(user, size) + url = avatar_url(user, size*2) except Exception as e: # Catch exceptions to avoid 500 errors. logger.error(e) diff --git a/seahub/settings.py b/seahub/settings.py index 4b2278b3f5..7d7f2b5947 100644 --- a/seahub/settings.py +++ b/seahub/settings.py @@ -338,7 +338,7 @@ AVATAR_DEFAULT_URL = '/avatars/default.png' AVATAR_DEFAULT_NON_REGISTERED_URL = '/avatars/default-non-register.jpg' AVATAR_MAX_AVATARS_PER_USER = 1 AVATAR_CACHE_TIMEOUT = 14 * 24 * 60 * 60 -AUTO_GENERATE_AVATAR_SIZES = (16, 20, 24, 28, 32, 36, 40, 42, 48, 60, 64, 80, 84) +AUTO_GENERATE_AVATAR_SIZES = (16, 20, 24, 28, 32, 36, 40, 42, 48, 60, 64, 72, 80, 84, 160) # Group avatar GROUP_AVATAR_STORAGE_DIR = 'avatars/groups' GROUP_AVATAR_DEFAULT_URL = 'avatars/groups/default.png' diff --git a/static/scripts/app/views/dir.js b/static/scripts/app/views/dir.js index 8120d7965e..c8b30d78ce 100644 --- a/static/scripts/app/views/dir.js +++ b/static/scripts/app/views/dir.js @@ -1000,6 +1000,7 @@ define([ _this.$('th .checkbox').removeClass('checkbox-checked'); _this.$('#multi-dirents-op').hide(); _this.$('#cur-dir-ops').show(); + _this.updateDirOpBarUI(); } else { $(selected_dirents).each(function() { if (data['deleted'].indexOf(this.get('obj_name')) != -1) { @@ -1144,6 +1145,7 @@ define([ _this.$('th .checkbox').removeClass('checkbox-checked'); _this.$('#multi-dirents-op').hide(); _this.$('#cur-dir-ops').show(); + _this.updateDirOpBarUI(); } else { $(dirs).each(function() { if (this.get('obj_name') in data['success']) {