From 225cfbc7a0717ab93eab44a8ae3b7fa76b42d99c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Thu, 6 Mar 2014 18:36:40 +0100 Subject: [PATCH] Minor improvements --- taiga/projects/issues/api.py | 1 + taiga/projects/issues/serializers.py | 4 ++-- taiga/projects/userstories/api.py | 1 + taiga/projects/userstories/serializers.py | 1 - 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/taiga/projects/issues/api.py b/taiga/projects/issues/api.py index 20475044..c038f48c 100644 --- a/taiga/projects/issues/api.py +++ b/taiga/projects/issues/api.py @@ -88,6 +88,7 @@ class IssuesOrdering(filters.FilterBackend): class IssueViewSet(NotificationSenderMixin, ModelCrudViewSet): model = models.Issue serializer_class = serializers.IssueNeighborsSerializer + list_serializer_class = serializers.IssueSerializer permission_classes = (IsAuthenticated, permissions.IssuePermission) filter_backends = (filters.IsProjectMemberFilterBackend, IssuesFilter, IssuesOrdering) diff --git a/taiga/projects/issues/serializers.py b/taiga/projects/issues/serializers.py index c25ebfb6..9f79cfdc 100644 --- a/taiga/projects/issues/serializers.py +++ b/taiga/projects/issues/serializers.py @@ -7,7 +7,7 @@ from taiga.base.serializers import PickleField, NeighborsSerializerMixin from . import models -class IssueSerializer(NeighborsSerializerMixin, serializers.ModelSerializer): +class IssueSerializer(serializers.ModelSerializer): tags = PickleField(required=False) comment = serializers.SerializerMethodField("get_comment") is_closed = serializers.Field(source="is_closed") @@ -19,7 +19,7 @@ class IssueSerializer(NeighborsSerializerMixin, serializers.ModelSerializer): return "" -class IssueNeighborsSerializer(IssueSerializer): +class IssueNeighborsSerializer(NeighborsSerializerMixin, IssueSerializer): def serialize_neighbor(self, neighbor): return NeighborIssueSerializer(neighbor).data diff --git a/taiga/projects/userstories/api.py b/taiga/projects/userstories/api.py index 6a18fa79..b1c9da0e 100644 --- a/taiga/projects/userstories/api.py +++ b/taiga/projects/userstories/api.py @@ -58,6 +58,7 @@ class UserStoryAttachmentViewSet(ModelCrudViewSet): class UserStoryViewSet(NotificationSenderMixin, ModelCrudViewSet): model = models.UserStory serializer_class = serializers.UserStoryNeighborsSerializer + list_serializer_class = serializers.UserStorySerializer permission_classes = (IsAuthenticated, permissions.UserStoryPermission) filter_backends = (filters.IsProjectMemberFilterBackend, filters.TagsFilter) diff --git a/taiga/projects/userstories/serializers.py b/taiga/projects/userstories/serializers.py index acb0c32b..88884c75 100644 --- a/taiga/projects/userstories/serializers.py +++ b/taiga/projects/userstories/serializers.py @@ -20,7 +20,6 @@ class RolePointsField(serializers.WritableField): class UserStorySerializer(serializers.ModelSerializer): tags = PickleField(default=[], required=False) - # is_closed = serializers.Field(source="is_closed") points = RolePointsField(source="role_points", required=False) total_points = serializers.SerializerMethodField("get_total_points") comment = serializers.SerializerMethodField("get_comment")