From d9833ab5fbfcfb7cb26e65a8af7004cd44572cdd Mon Sep 17 00:00:00 2001 From: lian Date: Thu, 16 May 2024 10:34:13 +0800 Subject: [PATCH] update --- seahub/institutions/api_views.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/seahub/institutions/api_views.py b/seahub/institutions/api_views.py index 32674660a4d..d032683b840 100644 --- a/seahub/institutions/api_views.py +++ b/seahub/institutions/api_views.py @@ -101,14 +101,18 @@ def get(self, request): user_info['email'] = email user_info['name'] = email2nickname(email) user_info['contact_email'] = email2contact_email(email) - user_info['is_admin'] = email in admin_emails + user_info['is_institution_admin'] = email in admin_emails user_info['avatar_url'], _, _ = api_avatar_url(email, 72) try: user_obj = User.objects.get(email=email) user_info['is_active'] = user_obj.is_active + user_info['is_system_admin'] = user.is_staff + user_info['create_time'] = timestamp_to_isoformat_timestr(user.ctime) except User.DoesNotExist: user_info['is_active'] = '' + user_info['is_system_admin'] = '' + user_info['create_time'] = '' user_info['last_login'] = '' for last_login in last_logins: @@ -284,14 +288,18 @@ def get(self, request): user_info['email'] = email user_info['name'] = email2nickname(email) user_info['contact_email'] = email2contact_email(email) - user_info['is_admin'] = email in admin_emails + user_info['is_institution_admin'] = email in admin_emails user_info['avatar_url'], _, _ = api_avatar_url(email, 72) try: user_obj = User.objects.get(email=email) user_info['is_active'] = user_obj.is_active + user_info['is_system_admin'] = user.is_staff + user_info['create_time'] = timestamp_to_isoformat_timestr(user.ctime) except User.DoesNotExist: user_info['is_active'] = '' + user_info['is_system_admin'] = '' + user_info['create_time'] = '' user_info['last_login'] = '' for last_login in last_logins: