fix(User): Fixed user-list image when no picture

roadiz · May 27, 2024 · 399bd91 · 399bd91
1 parent 1876eea
commit 399bd91
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 15 deletions.
diff --git a/lib/Rozier/src/Resources/views/modules/history-item.html.twig b/lib/Rozier/src/Resources/views/modules/history-item.html.twig
@@ -22,20 +22,25 @@
                 {% set userPath = '#' %}
             {% endif %}
             <a href="{{ userPath }}">
-                <img width="60"
-                     height="60"
-                     class="user-image uk-thumbnail"
-                     src="{{ log.additionalData.user_picture_url }}"
-                     alt="{{ log.additionalData.user_public_name|default(log.username) }}"
-                     title="{{ log.additionalData.user_public_name|default(log.username) }}"
-                     data-uk-tooltip="{animation:true}"/>
+                {% if log.additionalData.user_picture_url %}
+                    <img width="60"
+                         height="60"
+                         class="user-image uk-thumbnail"
+                         src="{{ log.additionalData.user_picture_url }}"
+                         alt="{{ log.additionalData.user_public_name|default(log.username) }}"
+                         title="{{ log.additionalData.user_public_name|default(log.username) }}"
+                         data-uk-tooltip="{animation:true}"/>
+                {% else %}
+                    <span
+                        data-uk-tooltip="{animation:true}"
+                        title="{{ log.additionalData.user_public_name|default(log.username) }}"
+                        class="user-image uk-thumbnail"><i class="uk-icon uk-icon-rz-user"></i></span>
+                {% endif %}
             </a>
         </div>
     {% elseif log.username %}
         <div class="history-log-user">
             <span class="user-image uk-thumbnail"
-                  width="60"
-                  height="60"
                   title="{{ log.username }}"
                   data-uk-tooltip="{animation:true}" ><i class="uk-icon uk-icon-rz-user"></i></span>
         </div>

diff --git a/lib/Rozier/src/Resources/views/users/user_row.html.twig b/lib/Rozier/src/Resources/views/users/user_row.html.twig
@@ -1,10 +1,19 @@
 <td class="mobile-hidden uk-visible-xlarge">
-    <img width="45" height="45"
-         data-uk-tooltip="{animation:true}"
-         title="{{- item.identifier|default(item.username) -}}"
-         class="uk-thumbnail gravatar user-image"
-         src="{{ item.pictureUrl }}"
-         alt="{{ item.identifier }}" />
+    {% if item.pictureUrl and item.pictureUrl != '#' %}
+        <img width="45" height="45"
+             data-uk-tooltip="{animation:true}"
+             title="{{- item.identifier|default(item.username) -}}"
+             class="uk-thumbnail gravatar user-image"
+             src="{{ item.pictureUrl }}"
+             alt="{{ item.identifier }}" />
+    {% else %}
+        <span
+            data-uk-tooltip="{animation:true}"
+            title="{{- item.identifier|default(item.username) -}}"
+            class="uk-thumbnail gravatar user-image">
+            <i class="uk-icon uk-icon-rz-user"></i>
+        </span>
+    {% endif %}
 </td>
 <td>
     {% if is_granted('ROLE_SUPERADMIN') or not item.SuperAdmin %}