haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-24 04:48:03 +00:00
Code Issues Releases Wiki Activity

Merge branch '8.0' into master

Browse Source
This commit is contained in:
lian
2021-12-10 14:36:16 +08:00
parent 9854ce5e18 7ab606698c
commit eab3ba2f6d
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/pages/upload-link/file-uploader.js
View File

@@ -439,7 +439,7 @@ class FileUploader extends React.Component {
msg = gettext('Failed to upload {file_name}.')
.replace('{file_name}', file.fileName);
}
toaster.danger(msg);
toaster.danger(msg, {'id': 'file-error-msg'});
this.error = true;
// reset upload link loaded

5
seahub/api2/endpoints/invitation.py
View File

@@ -15,6 +15,7 @@ from seahub.api2.throttling import UserRateThrottle
from seahub.api2.utils import api_error
from seahub.invitations.models import Invitation
from seahub.base.accounts import User
from seahub.base.templatetags.seahub_tags import email2nickname
from seahub.utils.mail import send_html_email_with_dj_template
from seahub.utils import get_site_name
@@ -103,9 +104,9 @@ class InvitationRevokeView(APIView):
# send email
site_name = get_site_name()
subject = _('%(user)s revoked your access to %(site_name)s.') % {
'user': inviter, 'site_name': site_name}
'user': email2nickname(inviter), 'site_name': site_name}
context = {
'inviter': inviter,
'inviter': email2nickname(inviter),
'site_name': site_name,
}