From 293bd11b4cdcff3e7eb776a3a9a35f4e784a50a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AC=A2=E4=B9=90=E9=A9=AC?= <38058090+SkywalkerSpace@users.noreply.github.com> Date: Thu, 29 Aug 2024 11:05:08 +0800 Subject: [PATCH 1/2] 11.0 fix write_secret_key (#6663) --- scripts/setup-seafile-mysql.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/setup-seafile-mysql.py b/scripts/setup-seafile-mysql.py index 9c5dcf0010..e7e9a66bb9 100644 --- a/scripts/setup-seafile-mysql.py +++ b/scripts/setup-seafile-mysql.py @@ -1056,7 +1056,7 @@ class SeahubConfigurator(AbstractConfigurator): script, ] key = Utils.get_command_output(cmd).strip() - fp.write('SECRET_KEY = "%s"' % key) + fp.write('SECRET_KEY = "%s"' % key.decode()) def write_database_config(self, fp): template = '''\ From 6f486a5044fdc3ac0013cb342cafd7b6c593d726 Mon Sep 17 00:00:00 2001 From: lian Date: Thu, 29 Aug 2024 16:44:55 +0800 Subject: [PATCH 2/2] fix bug when org admin invite user (#6669) --- seahub/organizations/api/admin/users.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/seahub/organizations/api/admin/users.py b/seahub/organizations/api/admin/users.py index 584e85c404..21cc561463 100644 --- a/seahub/organizations/api/admin/users.py +++ b/seahub/organizations/api/admin/users.py @@ -827,8 +827,9 @@ class OrgAdminInviteUser(APIView): for email in email_list: + vid = get_virtual_id_by_email(email) try: - User.objects.get(email=email) + User.objects.get(email=vid) result['failed'].append({ 'email': email, 'error_msg': _(f'User {email} already exists.')