From 4beb2eea1636ea61197b0d074f0173bad675952b Mon Sep 17 00:00:00 2001
From: LeoSirius <is.li.xiaoyu@qq.com>
Date: Thu, 27 Jun 2019 18:38:23 +0800
Subject: [PATCH 1/2] show quota in deparment page

---
 frontend/src/models/group.js            | 2 ++
 frontend/src/pages/groups/group-view.js | 5 ++++-
 seahub/api2/endpoints/groups.py         | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

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 {
                     <span className="path-split">/</span>
                     <span>{currentGroup.name}</span>
                     {currentGroup.parent_group_id !== 0 && (
-                      <span className="department-group-icon fas fa-building" title={gettext('This is a special group representing a department.')}></span>
+                      <Fragment>
+                        <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 className="path-tool">
diff --git a/seahub/api2/endpoints/groups.py b/seahub/api2/endpoints/groups.py
index 5e2ddc6f78..74cc5d5013 100644
--- a/seahub/api2/endpoints/groups.py
+++ b/seahub/api2/endpoints/groups.py
@@ -68,6 +68,9 @@ 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)
     }
+    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
 

From 1d026e893167e3ebb28bdcbda813b917737f31a7 Mon Sep 17 00:00:00 2001
From: LeoSirius <is.li.xiaoyu@qq.com>
Date: Fri, 28 Jun 2019 10:56:15 +0800
Subject: [PATCH 2/2] add comment

---
 seahub/api2/endpoints/groups.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/seahub/api2/endpoints/groups.py b/seahub/api2/endpoints/groups.py
index 74cc5d5013..4251bddc56 100644
--- a/seahub/api2/endpoints/groups.py
+++ b/seahub/api2/endpoints/groups.py
@@ -68,6 +68,9 @@ 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)