From 9535717c064bc3dc73a735c2211ffa8447ca7e76 Mon Sep 17 00:00:00 2001 From: Alfredo Sumaran Date: Wed, 31 May 2017 15:11:06 -0500 Subject: [PATCH] Rename exposed property for better understanding --- app/assets/javascripts/groups/stores/groups_store.js | 4 ++-- app/serializers/group_entity.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/groups/stores/groups_store.js b/app/assets/javascripts/groups/stores/groups_store.js index b0a173ff609..fc925172c2f 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: rawGroup.number_projects, - numberUsers: rawGroup.number_users, + numberProjects: rawGroup.number_projects_with_delimiter, + numberUsers: rawGroup.number_users_with_delimiter, subGroups: {}, }; } diff --git a/app/serializers/group_entity.rb b/app/serializers/group_entity.rb index 9a455cf55c9..4305e44ba26 100644 --- a/app/serializers/group_entity.rb +++ b/app/serializers/group_entity.rb @@ -32,11 +32,11 @@ class GroupEntity < Grape::Entity group.children.any? end - expose :number_projects do |group| + expose :number_projects_with_delimiter do |group| number_with_delimiter(group.projects.non_archived.count) end - expose :number_users do |group| + expose :number_users_with_delimiter do |group| number_with_delimiter(group.users.count) end end -- GitLab