taiga
/
taiga-back
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adding count of members to roles list

remotes/origin/enhancement/email-actions
Jesús Espino 2014-07-28 18:36:11 +02:00
parent 2439037b1c
commit c0bf954d46
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
taiga/base/neighbors.py
View File

@ -114,7 +114,6 @@ def _get_candidates(obj, results_set, reverse=False):
return (results_set return (results_set
.filter(~Q(id=obj.id), disjunction_filters(filters)) .filter(~Q(id=obj.id), disjunction_filters(filters))
.filter(project_id=obj.project.id)
.distinct() .distinct()
.order_by(*ordering)) .order_by(*ordering))
_left_candidates = partial(_get_candidates, reverse=True) _left_candidates = partial(_get_candidates, reverse=True)

6
taiga/projects/serializers.py
View File

@ -185,11 +185,15 @@ class ProjectRoleSerializer(serializers.ModelSerializer):
class RoleSerializer(serializers.ModelSerializer): class RoleSerializer(serializers.ModelSerializer):
members_count = serializers.SerializerMethodField("get_members_count")
permissions = PgArrayField(required=False) permissions = PgArrayField(required=False)
class Meta: class Meta:
model = Role 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): class ProjectTemplateSerializer(serializers.ModelSerializer):