From 16ff5a51269654e10f2e037e12b92c6e08b58e37 Mon Sep 17 00:00:00 2001
From: Julian Leucker <leuckerj@gmail.com>
Date: Sun, 6 Feb 2022 13:50:07 +0100
Subject: [PATCH] Display the avatar on person full page, if photo is displayed
above
---
aleksis/core/templates/core/person/full.html | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/aleksis/core/templates/core/person/full.html b/aleksis/core/templates/core/person/full.html
index 340b09dcb..5c6403257 100644
--- a/aleksis/core/templates/core/person/full.html
+++ b/aleksis/core/templates/core/person/full.html
@@ -189,19 +189,22 @@
{% endif %}
</table>
</div>
+ {% has_perm 'core.view_avatar_rule' user person as can_view_avatar %}
{% has_perm 'core.view_photo_rule' user person as can_view_photo %}
- {% if person.photo and can_view_photo %}
+ {% if person.photo and can_view_photo and not SITE_PREFERENCES.account__person_prefer_photo %}
<div class="card">
<div class="card-image">
<img src="{{ person.photo.url }}" alt="{{ person.first_name }} {{ person.last_name }}" class="materialboxed">
<span class="card-title">{{ person.first_name }} {{ person.last_name }}</span>
</div>
</div>
-
- {% else %}
- <div class="card-panel">
- <i class="material-icons left">image_not_supported</i>
- {% trans "This person didn't upload a personal photo." %}
+ {% elif person.avatr and can_view_avatar %}
+ <div class="card">
+ <div class="card-image">
+ <img src="{{ person.avatar.url }}"
+ alt="{{ person.first_name }} {{ person.last_name }} ({% trans "Avatar" %})" class="materialboxed">
+ <span class="card-title">{{ person.first_name }} {{ person.last_name }} ({% trans "Avatar" %})</span>
+ </div>
</div>
{% endif %}
</div>
--
GitLab