Skip to content

Commit 5964b2e

Browse files
committed
Update avatars to add hq_image, use with fiscal committee list (#1869(
1 parent 8294d3f commit 5964b2e

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed

templates/admin/release_report_detail.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ <h2 class="mt-0">From the Fiscal Sponsorship Committee</h2>
187187
<div class="committee_members flex flex-wrap mt-2 text-sm text-center absolute" style="">
188188
{% for user in committee_members|dictsort:"display_name" %}
189189
<figure class="w-32 m-2">
190-
{% avatar user=user is_link=False image_size="w-32 h-32" icon_size="text-8xl" %}
190+
{% avatar user=user is_link=False image_size="w-32 h-32" icon_size="text-8xl" use_user_hq_image=True %}
191191
<figcaption class="p-1">{{user.display_name}}</figcaption>
192192
</figure>
193193
{% endfor %}

users/models.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,12 @@ def get_thumbnail_url(self):
292292
with suppress(AttributeError, MissingSource):
293293
return getattr(self.image_thumbnail, "url", None)
294294

295+
def get_hq_image_url(self):
296+
# convenience method for templates
297+
if self.hq_image and self.hq_image_render:
298+
with suppress(AttributeError, MissingSource):
299+
return getattr(self.hq_image_render, "url", None)
300+
295301
@property
296302
def github_profile_url(self):
297303
if not self.github_username:

users/templatetags/avatar_tags.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ def avatar(
4444
icon_size=None,
4545
contributor_label=None,
4646
avatar_type=None,
47+
use_user_hq_image=False,
4748
):
4849
def get_commit_author_attribute(commitauthor, attribute):
4950
if isinstance(commitauthor, dict):
@@ -64,22 +65,27 @@ def get_commit_author_attribute(commitauthor, attribute):
6465
}
6566

6667
if user and commitauthor:
67-
image_url = user.get_thumbnail_url() or get_commit_author_attribute(
68+
std_image = user.get_thumbnail_url() or get_commit_author_attribute(
6869
commitauthor, "avatar_url"
6970
)
71+
hq_image = user.get_hq_image_url()
72+
use_hq_image = use_user_hq_image and hq_image
7073
href = user.github_profile_url or get_commit_author_attribute(
7174
commitauthor, "github_profile_url"
7275
)
7376
return base_avatar(
7477
commitauthor.display_name,
75-
image_url,
78+
hq_image if use_hq_image else std_image,
7679
href,
7780
**kwargs,
7881
)
7982
elif user:
83+
std_image = user.get_thumbnail_url()
84+
hq_image = user.get_hq_image_url()
85+
use_hq_image = use_user_hq_image and hq_image
8086
return base_avatar(
8187
user.display_name,
82-
user.get_thumbnail_url(),
88+
hq_image if use_hq_image else std_image,
8389
user.github_profile_url,
8490
**kwargs,
8591
)

0 commit comments

Comments
 (0)