Fix "no avatar" displays in new ui

MTG · Nov 8, 2023 · 95d2de4 · 95d2de4
1 parent 9d64ffc
commit 95d2de4
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 7 deletions.
diff --git a/accounts/models.py b/accounts/models.py
@@ -241,11 +241,10 @@ def locations_static(user_id, has_avatar):
             l_avatar = settings.AVATARS_URL + "%s/%d_L.jpg" % (id_folder, user_id)
             xl_avatar = settings.AVATARS_URL + "%s/%d_XL.jpg" % (id_folder, user_id)
         else:
-            # NOTE: this images are no longer used in the new UI, this might be refactored
-            s_avatar = static(f'bw-frontend/public/32x32_avatar.png')
-            m_avatar = static(f'bw-frontend/public/40x40_avatar.png')
-            l_avatar = static(f'bw-frontend/public/70x70_avatar.png')
-            xl_avatar = static(f'bw-frontend/public/100x100_avatar.png')
+            s_avatar = None
+            m_avatar = None
+            l_avatar = None
+            xl_avatar = None
         return dict(
             avatar=dict(
                 S=dict(

diff --git a/freesound/static/bw-frontend/public/100x100_avatar.png b/freesound/static/bw-frontend/public/100x100_avatar.png
diff --git a/freesound/static/bw-frontend/public/32x32_avatar.png b/freesound/static/bw-frontend/public/32x32_avatar.png
diff --git a/freesound/static/bw-frontend/public/40x40_avatar.png b/freesound/static/bw-frontend/public/40x40_avatar.png
diff --git a/freesound/static/bw-frontend/public/70x70_avatar.png b/freesound/static/bw-frontend/public/70x70_avatar.png
diff --git a/general/templatetags/bw_templatetags.py b/general/templatetags/bw_templatetags.py
@@ -78,7 +78,6 @@ def bw_user_avatar(avatar_url, username, size=40, extra_class=''):
 
     return {
         'size': size,
-        'has_avatar': '_avatar.png' not in avatar_url,
         'avatar_url':avatar_url,
         'username': username,
         'font_size': int(size * 0.4),

diff --git a/templates/atoms/avatar.html b/templates/atoms/avatar.html
@@ -1,4 +1,4 @@
-{% if has_avatar %}
+{% if avatar_url is not None %}
     <div class="avatar" style="width:{{ size }}px;height:{{ size }}px;">
         <img src="{{ avatar_url }}"  class="avatar {{ extra_class }}" style="width:{{ size }}px;height:{{ size }}px;" />
     </div>