haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-07-13 15:05:30 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3747 from haiwen/7.0-show-used-quota-of-department

Browse Source 
show quota in department group, after path icon
This commit is contained in:
杨顺强 2019-06-28 11:43:21 +08:00 committed by GitHub
commit aa97e8c87f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/models/group.js
View File

@ -9,6 +9,8 @@ class Group {
this.parent_group_id = object.parent_group_id; this.parent_group_id = object.parent_group_id;
this.wiki_enabled = object.wiki_enabled; this.wiki_enabled = object.wiki_enabled;
this.repos = object.repos || []; this.repos = object.repos || [];
this.group_quota = object.group_quota;
this.group_quota_usage = object.group_quota_usage;
} }
} }

3
frontend/src/pages/groups/group-view.js
View File

@ -388,7 +388,10 @@ class GroupView extends React.Component {
<span className="path-split">/</span> <span className="path-split">/</span>
<span>{currentGroup.name}</span> <span>{currentGroup.name}</span>
{currentGroup.parent_group_id !== 0 && ( {currentGroup.parent_group_id !== 0 && (
<Fragment>
<span className="department-group-icon fas fa-building" title={gettext('This is a special group representing a department.')}></span> <span className="department-group-icon fas fa-building" title={gettext('This is a special group representing a department.')}></span>
<span>{' '}{'（'}{gettext('Used:')}{' '}{Utils.bytesToSize(currentGroup.group_quota_usage)}{'/'}{Utils.bytesToSize(currentGroup.group_quota)}{'）'}</span>
</Fragment>
)} )}
</div> </div>
<div className="path-tool"> <div className="path-tool">

6
seahub/api2/endpoints/groups.py
View File

@ -68,6 +68,12 @@ def get_group_info(request, group_id, avatar_size=GROUP_AVATAR_DEFAULT_SIZE):
"admins": get_group_admins(group.id), "admins": get_group_admins(group.id),
"wiki_enabled": is_wiki_mod_enabled_for_group(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 return group_info