diff --git a/frontend/src/models/group.js b/frontend/src/models/group.js index c0dab049c4..9bc59c5c7c 100644 --- a/frontend/src/models/group.js +++ b/frontend/src/models/group.js @@ -9,6 +9,8 @@ class Group { this.parent_group_id = object.parent_group_id; this.wiki_enabled = object.wiki_enabled; this.repos = object.repos || []; + this.group_quota = object.group_quota; + this.group_quota_usage = object.group_quota_usage; } } diff --git a/frontend/src/pages/groups/group-view.js b/frontend/src/pages/groups/group-view.js index 840b327823..4b51917ce8 100644 --- a/frontend/src/pages/groups/group-view.js +++ b/frontend/src/pages/groups/group-view.js @@ -388,7 +388,10 @@ class GroupView extends React.Component { / {currentGroup.name} {currentGroup.parent_group_id !== 0 && ( - + + + {' '}{'('}{gettext('Used:')}{' '}{Utils.bytesToSize(currentGroup.group_quota_usage)}{'/'}{Utils.bytesToSize(currentGroup.group_quota)}{')'} + )}
diff --git a/seahub/api2/endpoints/groups.py b/seahub/api2/endpoints/groups.py index 5e2ddc6f78..4251bddc56 100644 --- a/seahub/api2/endpoints/groups.py +++ b/seahub/api2/endpoints/groups.py @@ -68,6 +68,12 @@ def get_group_info(request, group_id, avatar_size=GROUP_AVATAR_DEFAULT_SIZE): "admins": get_group_admins(group.id), "wiki_enabled": is_wiki_mod_enabled_for_group(group_id) } + # parent_group_id = 0: non department group + # parent_group_id = -1: top department group + # parent_group_id = n(n > 0): sub department group, n is parent group's id + if group.parent_group_id != 0: + group_info['group_quota'] = seafile_api.get_group_quota(group_id) + group_info['group_quota_usage'] = seafile_api.get_group_quota_usage(group_id) return group_info