From 8f544663c7c59eadce589fc65377bb543c1346aa Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Thu, 28 May 2015 14:51:26 +0200 Subject: [PATCH] Updating project list and detail serializers --- taiga/projects/serializers.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/taiga/projects/serializers.py b/taiga/projects/serializers.py index 48791495..d79fff21 100644 --- a/taiga/projects/serializers.py +++ b/taiga/projects/serializers.py @@ -305,7 +305,6 @@ class ProjectSerializer(serializers.ModelSerializer): my_permissions = serializers.SerializerMethodField("get_my_permissions") i_am_owner = serializers.SerializerMethodField("get_i_am_owner") tags_colors = TagsColorsField(required=False) - users = serializers.SerializerMethodField("get_users") total_closed_milestones = serializers.SerializerMethodField("get_total_closed_milestones") class Meta: @@ -328,9 +327,6 @@ class ProjectSerializer(serializers.ModelSerializer): return is_project_owner(self.context["request"].user, obj) return False - def get_users(self, obj): - return UserSerializer(obj.members.all(), many=True).data - def get_total_closed_milestones(self, obj): return obj.milestones.filter(closed=True).count() @@ -355,12 +351,14 @@ class ProjectDetailSerializer(ProjectSerializer): issue_types = IssueTypeSerializer(many=True, required=False) priorities = PrioritySerializer(many=True, required=False) # Issues severities = SeveritySerializer(many=True, required=False) + userstory_custom_attributes = UserStoryCustomAttributeSerializer(source="userstorycustomattributes", many=True, required=False) task_custom_attributes = TaskCustomAttributeSerializer(source="taskcustomattributes", many=True, required=False) issue_custom_attributes = IssueCustomAttributeSerializer(source="issuecustomattributes", many=True, required=False) + users = serializers.SerializerMethodField("get_users") def get_memberships(self, obj): qs = obj.memberships.filter(user__isnull=False) @@ -374,6 +372,9 @@ class ProjectDetailSerializer(ProjectSerializer): serializer = ProjectRoleSerializer(obj.roles.all(), many=True) return serializer.data + def get_users(self, obj): + return UserSerializer(obj.members.all(), many=True).data + class ProjectDetailAdminSerializer(ProjectDetailSerializer): class Meta: