From 0bbe0b569713e5c269b1ab15e582a32f490d29b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Mon, 4 Aug 2014 17:31:04 +0200 Subject: [PATCH] Bamedized some unnecessary attrs of ProjectDetailSerializer and fix a bug in front --- taiga/projects/serializers.py | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/taiga/projects/serializers.py b/taiga/projects/serializers.py index 41e11932..7d01a0c0 100644 --- a/taiga/projects/serializers.py +++ b/taiga/projects/serializers.py @@ -149,25 +149,17 @@ class ProjectSerializer(serializers.ModelSerializer): class ProjectDetailSerializer(ProjectSerializer): - roles = serializers.SerializerMethodField("get_list_of_roles") - memberships = serializers.SerializerMethodField("get_membership") - active_memberships = serializers.SerializerMethodField("get_active_membership") + roles = serializers.SerializerMethodField("get_roles") + memberships = serializers.SerializerMethodField("get_memberships") us_statuses = UserStoryStatusSerializer(many=True, required=False) # User Stories points = PointsSerializer(many=True, required=False) task_statuses = TaskStatusSerializer(many=True, required=False) # Tasks - priorities = PrioritySerializer(many=True, required=False) # Issues - severities = SeveritySerializer(many=True, required=False) issue_statuses = IssueStatusSerializer(many=True, required=False) issue_types = IssueTypeSerializer(many=True, required=False) + priorities = PrioritySerializer(many=True, required=False) # Issues + severities = SeveritySerializer(many=True, required=False) - def get_membership(self, obj): - qs = obj.memberships.order_by('user__full_name', 'user__username') - qs = qs.select_related("role", "user") - - serializer = ProjectMembershipSerializer(qs, many=True) - return serializer.data - - def get_active_membership(self, obj): + def get_memberships(self, obj): qs = obj.memberships.filter(user__isnull=False) qs = qs.order_by('user__full_name', 'user__username') qs = qs.select_related("role", "user") @@ -175,7 +167,7 @@ class ProjectDetailSerializer(ProjectSerializer): serializer = ProjectMembershipSerializer(qs, many=True) return serializer.data - def get_list_of_roles(self, obj): + def get_roles(self, obj): serializer = ProjectRoleSerializer(obj.roles.all(), many=True) return serializer.data