Fixed import of points object.

remotes/origin/enhancement/email-actions
Andrey Antukh 2013-10-10 16:45:17 +02:00
parent 0d365b6b9a
commit ab3e2b5336
2 changed files with 7 additions and 3 deletions

View File

@ -44,6 +44,7 @@ class TaskViewSet(NotificationSenderMixin, ModelCrudViewSet):
permission_classes = (IsAuthenticated, permissions.TaskPermission) permission_classes = (IsAuthenticated, permissions.TaskPermission)
filter_backends = (filters.IsProjectMemberFilterBackend,) filter_backends = (filters.IsProjectMemberFilterBackend,)
filter_fields = ["user_story", "milestone", "project"] filter_fields = ["user_story", "milestone", "project"]
create_notification_template = "create_task_notification" create_notification_template = "create_task_notification"
update_notification_template = "update_task_notification" update_notification_template = "update_task_notification"
destroy_notification_template = "destroy_task_notification" destroy_notification_template = "destroy_task_notification"

View File

@ -1,6 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import json, reversion import json, reversion
from django.db.models import get_model
from rest_framework import serializers from rest_framework import serializers
from greenmine.base.serializers import PickleField from greenmine.base.serializers import PickleField
@ -32,12 +33,14 @@ class UserStorySerializer(serializers.ModelSerializer):
def save_object(self, obj, **kwargs): def save_object(self, obj, **kwargs):
role_points = obj._related_data.pop("role_points", None) role_points = obj._related_data.pop("role_points", None)
super(UserStorySerializer, self).save_object(obj, **kwargs) super(UserStorySerializer, self).save_object(obj, **kwargs)
obj.project.update_role_points()
points_modelcls = get_model("projects", "Points")
obj.project.update_role_points()
if role_points: if role_points:
for role_id, points_order in role_points.items(): for role_id, points_order in role_points.items():
role_points = obj.role_points.get(role__id=role_id) role_points = obj.role_points.get(role__id=role_id)
role_points.points = models.Points.objects.get(project=obj.project, role_points.points = points_modelcls.objects.get(project=obj.project,
order=points_order) order=points_order)
role_points.save() role_points.save()