Fixing login users tooltip display

glpi-project · Apr 25, 2024 · 8400c6c · 8400c6c
1 parent 2677b93
commit 8400c6c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/templates/components/itilobject/selfservice.html.twig b/templates/components/itilobject/selfservice.html.twig
@@ -100,6 +100,10 @@
                                     {% set user_fields = user.fields %}
                                     {% set user_fields = user_fields|merge({user_name: user.getFriendlyName()}) %}
                                     {% set user_fields = user_fields|merge({email: user.getDefaultEmail()}) %}
+                                    {% set session_has_read_right = call('Session::haveRight', ['user', constant('READ')]) %}
+                                    {% if session_has_read_right %}
+                                        {% set user_fields = user_fields|merge({login: entry_user.fields['name']}) %}
+                                    {% endif %}
                                     {{ include('components/user/info_card.html.twig', {
                                         'user': user_fields,
                                         'can_edit': true

diff --git a/templates/components/itilobject/timeline/timeline.html.twig b/templates/components/itilobject/timeline/timeline.html.twig
@@ -137,6 +137,10 @@
                   {% set user_fields = entry_user.fields %}
                   {% set user_fields = user_fields|merge({user_name: entry_user.getFriendlyName()}) %}
                   {% set user_fields = user_fields|merge({email: entry_user.getDefaultEmail()}) %}
+                  {% set session_has_read_right = call('Session::haveRight', ['user', constant('READ')]) %}
+                  {% if session_has_read_right %}
+                     {% set user_fields = user_fields|merge({login: entry_user.fields['name']}) %}
+                  {% endif %}
                   <span id="timeline-avatar{{ avatar_rand }}">
                      {{ include('components/user/picture.html.twig', {
                         'users_id': users_id,
@@ -145,9 +149,10 @@
                      }, with_context = false) }}
                   </span>
                   {% if not anonym_user and entry_user.canView() %}
+                  {% set user = user_fields %}
                      {% do call('Html::showToolTip', [
                         include('components/user/info_card.html.twig', {
-                           'user': user_fields,
+                           'user': user,
                            'user_object': entry_user,
                            'enable_anonymization': false,
                         }, with_context = false), {

diff --git a/templates/components/user/link_with_tooltip.html.twig b/templates/components/user/link_with_tooltip.html.twig
@@ -44,6 +44,10 @@
         {% set user_fields = user.fields %}
         {% set user_fields = user_fields|merge({user_name: user.getFriendlyName()}) %}
         {% set user_fields = user_fields|merge({email: user.getDefaultEmail()}) %}
+        {% set session_has_read_right = call('Session::haveRight', ['user', constant('READ')]) %}
+        {% if session_has_read_right %}
+            {% set user_fields = user_fields|merge({login: user.fields['name']}) %}
+        {% endif %}
         {% do call(
             'Html::showToolTip',
             [