haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-08 18:30:53 +00:00
Code Issues Releases Wiki Activity

fix detail.resolve_comment is vacant (#7530)

Browse Source
This commit is contained in:
Michael An
2025-02-27 18:25:47 +08:00
committed by GitHub
parent 3899577631
commit e7f43e16f2
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -352,9 +352,16 @@ class NoticeItem extends React.Component {
notice = String(vfile);
});
if (is_resolved) {
notice = 'Marked "' + detail.resolve_comment + '" as resolved in document ' + sdoc_link;
if (detail.resolve_comment && detail.resolve_comment !== '\u200B') {
notice = gettext('Marked "{resolve_comment}" as resolved in document {sdoc_link}');
notice = notice.replace('{resolve_comment}', detail.resolve_comment);
notice = notice.replace('{sdoc_link}', sdoc_link);
} else {
notice = gettext('Marked as resolved in document {sdoc_link}');
notice = notice.replace('{sdoc_link}', sdoc_link);
}
} else {
notice = 'Added a new comment in document ' + sdoc_link + ':' + notice;
notice = gettext('Added a new comment in document {sdoc_link}:').replace('{sdoc_link}', sdoc_link) + notice;
}
return { avatar_url, username, notice };
}
@@ -373,9 +380,16 @@ class NoticeItem extends React.Component {
notice = String(vfile);
});
if (is_resolved) {
notice = 'Marked "' + detail.resolve_comment + '" as resolved in document ' + sdoc_link;
if (detail.resolve_comment && detail.resolve_comment !== '\u200B') {
notice = gettext('Marked "{resolve_comment}" as resolved in document {sdoc_link}');
notice = notice.replace('{resolve_comment}', detail.resolve_comment);
notice = notice.replace('{sdoc_link}', sdoc_link);
} else {
notice = gettext('Marked as resolved in document {sdoc_link}');
notice = notice.replace('{sdoc_link}', sdoc_link);
}
} else {
notice = 'Added a new reply in document ' + sdoc_link + ':' + notice;
notice = gettext('Added a new reply in document {sdoc_link}:').replace('{sdoc_link}', sdoc_link) + notice;
}
return { avatar_url, username, notice };
}