Skip to content
Snippets Groups Projects
Commit bea81b1e authored by gnaegi's avatar gnaegi
Browse files

OO-759 fix display of uploader instead of author configured in file metadata

parent cc8ea713
No related branches found
No related tags found
No related merge requests found
......@@ -290,7 +290,7 @@ public class ListRenderer {
//file metadata as tooltip
if (metaInfo != null) {
sb.append("<div id='o_sel_doc_tooltip_").append(pos).append("' class='b_ext_tooltip_wrapper b_briefcase_meta' style='display:none;'>");
sb.append("<div id='o_sel_doc_tooltip_").append(pos).append("' class='b_ext_tooltip_wrapper' style='display:none;'><div class=\"b_briefcase_meta\">");
if (StringHelper.containsNonWhitespace(metaInfo.getTitle())) {
sb.append("<h5>").append(Formatter.escapeDoubleQuotes(metaInfo.getTitle())).append("</h5>");
}
......@@ -303,15 +303,20 @@ public class ListRenderer {
sb.append("); background-repeat:no-repeat; background-position:50% 50%;'>&nbsp;</div>");
}
String author = metaInfo.getAuthor();
if (StringHelper.containsNonWhitespace(author)) {
// first try author info from metadata (creator)
String author = metaInfo.getCreator();
// fallback use file author (uploader)
if (!StringHelper.containsNonWhitespace(author)) {
author = metaInfo.getAuthor();
if(!"-".equals(author)) {
author = UserManager.getInstance().getUserDisplayName(author);
}
}
if (StringHelper.containsNonWhitespace(author)) {
sb.append("<p>").append(Formatter.escapeDoubleQuotes(translator.translate("mf.author")));
sb.append(": ").append(Formatter.escapeDoubleQuotes(author)).append("</p>");
}
sb.append("</div>")
sb.append("</div></div>")
.append("<script type='text/javascript'>")
.append("/* <![CDATA[ */")
.append("jQuery(function() {")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment