diff --git a/frontend/src/pages/org-admin/org-department-item.js b/frontend/src/pages/org-admin/org-department-item.js index 01af6a1dad..367a0632a4 100644 --- a/frontend/src/pages/org-admin/org-department-item.js +++ b/frontend/src/pages/org-admin/org-department-item.js @@ -255,7 +255,7 @@ class OrgDepartmentItem extends React.Component {

{gettext('Members')}

- {(members && members.length === 1 && members[0].role === 'Owner') ? + {(!members || members.length === 0) ?

{gettext('No members')}

: diff --git a/seahub/api2/endpoints/admin/address_book/groups.py b/seahub/api2/endpoints/admin/address_book/groups.py index 800313420c..5e85c6b570 100644 --- a/seahub/api2/endpoints/admin/address_book/groups.py +++ b/seahub/api2/endpoints/admin/address_book/groups.py @@ -88,7 +88,7 @@ class AdminAddressBookGroups(APIView): return api_error(status.HTTP_400_BAD_REQUEST, error_msg) # Group owner is 'system admin' - group_owner = request.data.get('group_owner', '') + group_owner = request.data.get('group_owner', 'system admin') try: parent_group = int(request.data.get('parent_group', -1)) @@ -196,6 +196,8 @@ class AdminAddressBookGroup(APIView): for m in members: member_info = self._get_address_book_group_memeber_info(request, m, avatar_size) + if member_info['role'] == 'Owner': + continue ret_members.append(member_info) ret_dict['groups'] = ret_groups