From c0bf954d46f758693a54389c30628b7148a28ffa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Mon, 28 Jul 2014 18:36:11 +0200 Subject: [PATCH] Adding count of members to roles list --- taiga/base/neighbors.py | 1 - taiga/projects/serializers.py | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/taiga/base/neighbors.py b/taiga/base/neighbors.py index ded44a76..b8368fa6 100644 --- a/taiga/base/neighbors.py +++ b/taiga/base/neighbors.py @@ -114,7 +114,6 @@ def _get_candidates(obj, results_set, reverse=False): return (results_set .filter(~Q(id=obj.id), disjunction_filters(filters)) - .filter(project_id=obj.project.id) .distinct() .order_by(*ordering)) _left_candidates = partial(_get_candidates, reverse=True) diff --git a/taiga/projects/serializers.py b/taiga/projects/serializers.py index 8ec0f860..5eab582a 100644 --- a/taiga/projects/serializers.py +++ b/taiga/projects/serializers.py @@ -185,11 +185,15 @@ class ProjectRoleSerializer(serializers.ModelSerializer): class RoleSerializer(serializers.ModelSerializer): + members_count = serializers.SerializerMethodField("get_members_count") permissions = PgArrayField(required=False) class Meta: model = Role - fields = ('id', 'name', 'permissions', 'computable', 'project', 'order') + fields = ('id', 'name', 'permissions', 'computable', 'project', 'order', 'members_count') + + def get_members_count(self, obj): + return obj.memberships.count() class ProjectTemplateSerializer(serializers.ModelSerializer):