haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-19 18:29:23 +00:00
Code Issues Releases Wiki Activity

FIX: org department no-name-member bug (#4616)

Browse Source 
* FIX: org department no-name-member bug

* filter empty-owner in department
This commit is contained in:
Alex Happy
2020-07-09 16:15:11 +08:00
committed by GitHub
parent 2fabfde54e
commit 8c093b25d9
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/pages/org-admin/org-department-item.js
View File

@@ -255,7 +255,7 @@ class OrgDepartmentItem extends React.Component {
<div className="fleft"><h3 className="sf-heading">{gettext('Members')}</h3></div> <div className="fleft"><h3 className="sf-heading">{gettext('Members')}</h3></div>
</div> </div>
<div className="cur-view-content"> <div className="cur-view-content">
{(members && members.length === 1 && members[0].role === 'Owner') ? {(!members || members.length === 0) ?
<p className="no-member">{gettext('No members')}</p> : <p className="no-member">{gettext('No members')}</p> :
<table> <table>
<thead> <thead>

4
seahub/api2/endpoints/admin/address_book/groups.py
View File

@@ -88,7 +88,7 @@ class AdminAddressBookGroups(APIView):
return api_error(status.HTTP_400_BAD_REQUEST, error_msg) return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
# Group owner is 'system admin' # Group owner is 'system admin'
group_owner = request.data.get('group_owner', '') group_owner = request.data.get('group_owner', 'system admin')
try: try:
parent_group = int(request.data.get('parent_group', -1)) parent_group = int(request.data.get('parent_group', -1))
@@ -196,6 +196,8 @@ class AdminAddressBookGroup(APIView):
for m in members: for m in members:
member_info = self._get_address_book_group_memeber_info(request, member_info = self._get_address_book_group_memeber_info(request,
m, avatar_size) m, avatar_size)
if member_info['role'] == 'Owner':
continue
ret_members.append(member_info) ret_members.append(member_info)
ret_dict['groups'] = ret_groups ret_dict['groups'] = ret_groups