XWIKI-21752: Email notifications events description do not display th…

…e user avatar anymore * Use the proper macro for displaying user in email notifications (cherry picked from commit 69fe80c)
xwiki · Jan 18, 2024 · a67815d · a67815d
1 parent 0353732
commit a67815d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/...eb/xwiki-platform-web-templates/src/main/resources/templates/notification/email/macros.vm b/...eb/xwiki-platform-web-templates/src/main/resources/templates/notification/email/macros.vm
@@ -107,7 +107,7 @@
 #end
 
 #macro(displayNotificationDescription $event)
-  #displayCompositeEventDescription($event)
+  #displayCompositeEventDescription($event true)
 #end
 
 

diff --git a/...form-web/xwiki-platform-web-templates/src/main/resources/templates/notification/macros.vm b/...form-web/xwiki-platform-web-templates/src/main/resources/templates/notification/macros.vm
@@ -65,7 +65,7 @@
       #end
     </div>
     <div class="notification-description">
-      #displayCompositeEventDescription($compositeEvent)
+      #displayCompositeEventDescription($compositeEvent false)
       <div><small class="text-muted">$escapetool.xml($services.date.displayTimeAgo($compositeEvent.dates.get(0)))</small></div>
     </div>
   #end
@@ -241,7 +241,7 @@ $xwiki.getPlainUserName($user)##
   #displayNotificationEventSkeleton($icon, 'comment', $content, '')
 #end
 
-#macro(displayCompositeEventDescription $compositeEvent)
+#macro(displayCompositeEventDescription $compositeEvent $forEmail)
   #set ($baseTranslationPrefix = "${compositeEvent.type}")
   #set ($fallbackTranslationPrefix = "notifications.events.${compositeEvent.type}")
   #set ($fallbackTranslationSuffix = "description")
@@ -254,7 +254,11 @@ $xwiki.getPlainUserName($user)##
       "${baseTranslationPrefix}.${fallbackTranslationSuffix}",
       "${fallbackTranslationPrefix}.${fallbackTranslationSuffix}"
     ])
-    #set ($translationParameters = ["#displayNotificationEventUsers($compositeEvent.users, true, false)"])
+    #if ($forEmail)
+      #set ($translationParameters = ["#displayEmailNotificationEventUsers($compositeEvent.users, true, false)"])
+    #else
+      #set ($translationParameters = ["#displayNotificationEventUsers($compositeEvent.users, true, false)"])
+    #end
     $services.localization.render($translationKeys,$translationParameters)
   #else
   <div>
@@ -269,7 +273,11 @@ $xwiki.getPlainUserName($user)##
     $services.localization.render($translationKeys,$translationParameters)
   </div>
   <div>
-    #displayNotificationEventUsers($compositeEvent.users, true, true)
+    #if ($forEmail)
+      #displayEmailNotificationEventUsers($compositeEvent.users, true, true)
+    #else
+      #displayNotificationEventUsers($compositeEvent.users, true, true)
+    #end
   </div>
   #end
 #end
-Original file line number
+Diff line change
@@ Expand Up / @@ -107,7 +107,7 @@ @@
     #end
     #macro(displayNotificationDescription $event)
-      #displayCompositeEventDescription($event)
+      #displayCompositeEventDescription($event true)
     #end
@@ Expand Down @@