Merge pull request #5413 from clarktsiory/bug_24282/display_user_role…

…s_on_hover_of_user_profile Fixes #24282: Display user roles on hover of user profile
Normation · Feb 29, 2024 · 31587cc · 31587cc
2 parents 760a173 + 1d644e6
commit 31587cc
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/...s/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/UserInformation.scala b/...s/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/UserInformation.scala
@@ -40,6 +40,7 @@ package com.normation.rudder.web.snippet
 import bootstrap.liftweb.RudderConfig
 import bootstrap.liftweb.UserLogout
 import com.normation.plugins.DefaultExtendableSnippet
+import com.normation.rudder.Role
 import com.normation.rudder.domain.logger.ApplicationLogger
 import com.normation.rudder.users.CurrentUser
 import com.normation.utils.DateFormaterService
@@ -69,13 +70,14 @@ class UserInformation extends DispatchSnippet with DefaultExtendableSnippet[User
           case Some(info) => info.name.getOrElse(info.id)
         }
 
+        val roles       = s"User roles : ${Role.toDisplayNames(u.roles).mkString(", ")}"
         val lastSession = userRepo.getLastPreviousLogin(u.getUsername).runNow match {
           case None    => ""
           case Some(s) =>
             s"Last login on '${DateFormaterService.getDisplayDate(s.creationDate)}' with '${s.authMethod}' authentication"
         }
 
-        "#openerAccount" #> <span id="openerAccount" title={lastSession}>{displayName}</span>
+        "#openerAccount" #> <span id="openerAccount" title={List(roles, lastSession).mkString("\n")}>{displayName}</span>
 
       case None =>
         S.session.foreach { session =>