haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-11 11:51:27 +00:00
Code Issues Releases Wiki Activity

update notice when file/folder is uploaded (#6022)

Browse Source 
A file named {filename} is uploaded.
A folder named {foldername} is uploaded.
This commit is contained in:
lian
2024-04-15 19:34:21 +08:00
committed by GitHub
parent 494a933fd6
commit c246b5a3a9
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/components/common/notice-item.js
View File

@@ -212,12 +212,11 @@ class NoticeItem extends React.Component {
notice = notice.replace('{/tagB}', '</a>'); notice = notice.replace('{/tagB}', '</a>');
} else { } else {
// 1. handle translate // 1. handle translate
notice = gettext('A file named {upload_file_link} is uploaded to {uploaded_link}.'); notice = gettext('A file named {upload_file_link} is uploaded.');
// 2. handle xss(cross-site scripting) // 2. handle xss(cross-site scripting)
notice = notice.replace('{upload_file_link}', `${fileName}`); notice = notice.replace('{upload_file_link}', `${fileName}`);
notice = Utils.HTMLescape(notice); notice = Utils.HTMLescape(notice);
notice = notice.replace('{uploaded_link}', '<strong>Deleted Library</strong>');
} }
return {avatar_url, notice}; return {avatar_url, notice};
} }
@@ -246,12 +245,11 @@ class NoticeItem extends React.Component {
notice = notice.replace('{/tagB}', '</a>'); notice = notice.replace('{/tagB}', '</a>');
} else { } else {
// 1. handle translate // 1. handle translate
notice = gettext('A folder named {upload_folder_link} is uploaded to {uploaded_link}.'); notice = gettext('A folder named {upload_folder_link} is uploaded.');
// 2. handle xss(cross-site scripting) // 2. handle xss(cross-site scripting)
notice = notice.replace('{upload_folder_link}', `${folderName}`); notice = notice.replace('{upload_folder_link}', `${folderName}`);
notice = Utils.HTMLescape(notice); notice = Utils.HTMLescape(notice);
notice = notice.replace('{uploaded_link}', '<strong>Deleted Library</strong>');
} }
return {avatar_url, notice}; return {avatar_url, notice};
} }

4
seahub/notifications/models.py
View File

@@ -558,7 +558,7 @@ class UserNotification(models.Model):
'name': escape(name), 'name': escape(name),
} }
else: else:
msg = _("A file named <strong>%(file_name)s</strong> is uploaded to <strong>Deleted Library</strong>") % { msg = _("A file named <strong>%(file_name)s</strong> is uploaded") % {
'file_name': escape(filename), 'file_name': escape(filename),
} }
@@ -600,7 +600,7 @@ class UserNotification(models.Model):
'name': escape(name), 'name': escape(name),
} }
else: else:
msg = _("A folder named <strong>%(folder_name)s</strong> is uploaded to <strong>Deleted Library</strong>") % { msg = _("A folder named <strong>%(folder_name)s</strong> is uploaded") % {
'folder_name': escape(foldername), 'folder_name': escape(foldername),
} }