From 9acfef9fc87cfaecc36faf6e82d117e740184129 Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Fri, 17 Apr 2020 20:42:06 +0800
Subject: [PATCH] [shared file view] update for watermark (#4536)

---
 frontend/src/components/shared-file-view/shared-file-view.js | 4 +++-
 seahub/templates/shared_file_view_react.html                 | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/shared-file-view/shared-file-view.js b/frontend/src/components/shared-file-view/shared-file-view.js
index 791fd09a4d..c1f5aaa181 100644
--- a/frontend/src/components/shared-file-view/shared-file-view.js
+++ b/frontend/src/components/shared-file-view/shared-file-view.js
@@ -158,7 +158,9 @@ class SharedFileView extends React.Component {
 if (enableWatermark) {
   let watermark_txt;
   if (loginUser) {
-    watermark_txt = siteName + '  ' + loginUser;
+    watermark_txt = siteName + ' ' + loginUser;
+  } else if (sharedBy) {
+    watermark_txt = siteName + ' ' + sharedBy;
   } else {
     watermark_txt = gettext('Anonymous User');
   }
diff --git a/seahub/templates/shared_file_view_react.html b/seahub/templates/shared_file_view_react.html
index 847cff4736..77c73f6f62 100644
--- a/seahub/templates/shared_file_view_react.html
+++ b/seahub/templates/shared_file_view_react.html
@@ -60,7 +60,7 @@ body {
       fileName: '{{ file_name|escapejs }}',
       fileSize: {{ file_size }},
       rawPath: '{{ raw_path|escapejs }}',
-      sharedBy: '{{ shared_by|email2nickname }}',
+      sharedBy: '{{ shared_by|email2nickname|escapejs }}',
       siteName: '{{ site_name }}',
       enableWatermark: {% if enable_watermark %}true{% else %}false{% endif %},
       canDownload: {% if permissions.can_download %}true{% else %}false{% endif %},