From 7c577f6c08c2550508231e3d31ff07d6feaaf51e Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Tue, 23 Feb 2016 10:10:53 +0100
Subject: [PATCH] OO-1905: make the reply really anonymous
---
.../modules/fo/ui/_content/msg-preview.html | 18 ++++++++++++++----
.../modules/fo/ui/_content/threadview.html | 2 +-
2 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/olat/modules/fo/ui/_content/msg-preview.html b/src/main/java/org/olat/modules/fo/ui/_content/msg-preview.html
index 643eeab622f..a7509878e1f 100644
--- a/src/main/java/org/olat/modules/fo/ui/_content/msg-preview.html
+++ b/src/main/java/org/olat/modules/fo/ui/_content/msg-preview.html
@@ -1,12 +1,22 @@
<div class="o_forum">
<div class="o_forum_message o_block_large_bottom">
<div class="o_forum_message_header clearfix">
- #if(!$guestOnly && $r.available("portrait"))
- $r.render("portrait")
- #end
+ #if(!$guestOnly)
+ #if($message.guest || ($message.pseudonym && !${message.pseudonym.isEmpty()}))
+ <div class="o_portrait"><div class="o_portrait_image"><img src="$r.staticLink("images/transparent.gif")" class="o_portrait_avatar o_portrait_anonymous" /></div></div>
+ #elseif($r.available("portrait"))
+ $r.render("portrait")
+ #end
+ #end
<h4 class="o_forum_message_title">$r.escapeHtml($message.getTitle())</h4>
<div class="o_author">
- $r.escapeHtml($identity.getUser().getProperty("firstName", $locale)) $r.escapeHtml($identity.getUser().getProperty("lastName", $locale))
+ #if($message.pseudonym && !${message.pseudonym.isEmpty()})
+ $r.escapeHtml($message.pseudonym)
+ #elseif($message.guest)
+ $r.translate("anonymous.poster")
+ #else
+ $r.escapeHtml($identity.getUser().getProperty("firstName", $locale)) $r.escapeHtml($identity.getUser().getProperty("lastName", $locale))
+ #end
</div>
<div class="o_date">$r.formatDateAndTime($message.getCreationDate())</div>
</div>
diff --git a/src/main/java/org/olat/modules/fo/ui/_content/threadview.html b/src/main/java/org/olat/modules/fo/ui/_content/threadview.html
index 4e3246fb2f5..1fb1bbc2433 100644
--- a/src/main/java/org/olat/modules/fo/ui/_content/threadview.html
+++ b/src/main/java/org/olat/modules/fo/ui/_content/threadview.html
@@ -94,7 +94,7 @@
$r.translate("anonymous.poster")
#elseif($r.available("vc_${message.key}"))
$r.render("vc_${message.key}")
- #else
+ #else
$r.escapeHtml($message.creatorFirstname) $r.escapeHtml($message.creatorLastname)
#end
</div>
--
GitLab