From 8c093b25d96131b3e05cdcb636e799f6a3b6caa9 Mon Sep 17 00:00:00 2001
From: Alex Happy <1223408988@qq.com>
Date: Thu, 9 Jul 2020 16:15:11 +0800
Subject: [PATCH] FIX: org department no-name-member bug (#4616)

* FIX: org department no-name-member bug

* filter empty-owner in department
---
 frontend/src/pages/org-admin/org-department-item.js | 2 +-
 seahub/api2/endpoints/admin/address_book/groups.py  | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

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 {
                 <div className="fleft"><h3 className="sf-heading">{gettext('Members')}</h3></div>
               </div>
               <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> :
                   <table>
                     <thead>
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