From 98903f940fcd3166f45dd49e545178d8318f611c Mon Sep 17 00:00:00 2001 From: lian Date: Mon, 30 Nov 2020 14:25:32 +0800 Subject: [PATCH] return members when admin get address book group --- seahub/api2/endpoints/admin/address_book/groups.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/seahub/api2/endpoints/admin/address_book/groups.py b/seahub/api2/endpoints/admin/address_book/groups.py index f678f91dae..4b2083f9d2 100644 --- a/seahub/api2/endpoints/admin/address_book/groups.py +++ b/seahub/api2/endpoints/admin/address_book/groups.py @@ -184,7 +184,20 @@ class AdminAddressBookGroup(APIView): for group in groups: ret_groups.append(address_book_group_to_dict(group)) + try: + members = ccnet_api.get_group_members(group_id) + except Exception as e: + logger.error(e) + error_msg = 'Internal Server Error' + return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg) + + for m in members: + member_info = self._get_address_book_group_memeber_info(request, + m, avatar_size) + ret_members.append(member_info) + ret_dict['groups'] = ret_groups + ret_dict['members'] = ret_members if return_ancestors: # get ancestor groups and remove last group which is self