Use UserStorySerializer instead MilestoneUserStorySerializer

remotes/origin/logger
David Barragán Merino 2015-12-08 20:59:03 +01:00
parent cc9a52a82c
commit 935046fae2
2 changed files with 2 additions and 14 deletions

View File

@ -21,12 +21,12 @@ from taiga.base.utils import json
from taiga.projects.notifications.mixins import WatchedResourceModelSerializer from taiga.projects.notifications.mixins import WatchedResourceModelSerializer
from taiga.projects.notifications.validators import WatchersValidator from taiga.projects.notifications.validators import WatchersValidator
from ..userstories.serializers import MilestoneUserStorySerializer from ..userstories.serializers import UserStorySerializer
from . import models from . import models
class MilestoneSerializer(WatchersValidator, WatchedResourceModelSerializer, serializers.ModelSerializer): class MilestoneSerializer(WatchersValidator, WatchedResourceModelSerializer, serializers.ModelSerializer):
user_stories = MilestoneUserStorySerializer(many=True, required=False, read_only=True) user_stories = UserStorySerializer(many=True, required=False, read_only=True)
total_points = serializers.SerializerMethodField("get_total_points") total_points = serializers.SerializerMethodField("get_total_points")
closed_points = serializers.SerializerMethodField("get_closed_points") closed_points = serializers.SerializerMethodField("get_closed_points")

View File

@ -45,18 +45,6 @@ class RolePointsField(serializers.WritableField):
return json.loads(obj) return json.loads(obj)
class MilestoneUserStorySerializer(serializers.ModelSerializer):
total_points = serializers.SerializerMethodField("get_total_points")
class Meta:
model = models.UserStory
depth = 0
fields = ("id", "ref", "subject", "milestone", "is_closed", "is_blocked", "total_points")
def get_total_points(self, obj):
return obj.get_total_points()
class UserStorySerializer(WatchersValidator, VoteResourceSerializerMixin, EditableWatchedResourceModelSerializer, class UserStorySerializer(WatchersValidator, VoteResourceSerializerMixin, EditableWatchedResourceModelSerializer,
serializers.ModelSerializer): serializers.ModelSerializer):
tags = TagsField(default=[], required=False) tags = TagsField(default=[], required=False)