summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Sumaran <alfredo@gitlab.com>2017-05-30 04:25:53 -0500
committerAlfredo Sumaran <alfredo@gitlab.com>2017-05-30 04:25:53 -0500
commit0b594f68271973ebc4c0464c3bac8e7cdad66ba8 (patch)
tree4bf719498d9b281c97c38d69d420a33e5989eba9
parenta9921e9d5d1f4b271b98913cfbc5ed682147d50f (diff)
downloadgitlab-ce-0b594f68271973ebc4c0464c3bac8e7cdad66ba8.tar.gz
Display number of users and number of projects for each group
-rw-r--r--app/assets/javascripts/groups/components/group_item.vue8
-rw-r--r--app/assets/javascripts/groups/stores/groups_store.js4
2 files changed, 7 insertions, 5 deletions
diff --git a/app/assets/javascripts/groups/components/group_item.vue b/app/assets/javascripts/groups/components/group_item.vue
index 9c20c9d52dc..f6238a01497 100644
--- a/app/assets/javascripts/groups/components/group_item.vue
+++ b/app/assets/javascripts/groups/components/group_item.vue
@@ -1,4 +1,6 @@
<script>
+/* eslint-disable no-alert */
+
import eventHub from '../event_hub';
export default {
@@ -29,7 +31,7 @@ export default {
},
leaveGroup() {
eventHub.$emit('leaveGroup', this.group.leavePath);
- }
+ },
},
computed: {
groupDomId() {
@@ -98,9 +100,9 @@ export default {
<i aria-hidden="true" class="fa fa-bookmark"></i>
{{group.numberProjects}}
</span>
- <span class="number-members">
+ <span class="number-users">
<i aria-hidden="true" class="fa fa-users"></i>
- {{group.numberMembers}}
+ {{group.numberUsers}}
</span>
<span class="group-visibility">
<i aria-hidden="true" class="fa fa-globe"></i>
diff --git a/app/assets/javascripts/groups/stores/groups_store.js b/app/assets/javascripts/groups/stores/groups_store.js
index 258bda7a2b0..b0a173ff609 100644
--- a/app/assets/javascripts/groups/stores/groups_store.js
+++ b/app/assets/javascripts/groups/stores/groups_store.js
@@ -127,8 +127,8 @@ export default class GroupsStore {
editPath: rawGroup.edit_path,
isOpen: false,
isOrphan: false,
- numberProjects: 10,
- numberMembers: 10,
+ numberProjects: rawGroup.number_projects,
+ numberUsers: rawGroup.number_users,
subGroups: {},
};
}