taiga
/
taiga-back
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

US #55: Custom fields - Minor refactor

remotes/origin/enhancement/email-actions
David Barragán Merino 2015-03-02 12:39:37 +01:00
parent f9cbc36303
commit 7ef5a3a9d9
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
taiga/projects/custom_attributes/serializers.py
View File

@ -32,7 +32,8 @@ from . import models
class BaseCustomAttributeSerializer(ModelSerializer): class BaseCustomAttributeSerializer(ModelSerializer):
class Meta: class Meta:
read_only_fields = ('id', 'created_date', 'modified_date') read_only_fields = ('id',)
exclude = ('created_date', 'modified_date')
def _validate_integrity_between_project_and_name(self, attrs, source): def _validate_integrity_between_project_and_name(self, attrs, source):
""" """

27
taiga/projects/serializers.py
View File

@ -34,10 +34,11 @@ from taiga.permissions.service import is_project_owner
from . import models from . import models
from . import services from . import services
from . validators import ProjectExistsValidator from .validators import ProjectExistsValidator
from . custom_attributes.serializers import(UserStoryCustomAttributeSerializer, from .custom_attributes.serializers import UserStoryCustomAttributeSerializer
TaskCustomAttributeSerializer, from .custom_attributes.serializers import TaskCustomAttributeSerializer
IssueCustomAttributeSerializer) from .custom_attributes.serializers import IssueCustomAttributeSerializer
###################################################### ######################################################
## Custom values for selectors ## Custom values for selectors
@ -264,9 +265,6 @@ class ProjectSerializer(ModelSerializer):
tags_colors = TagsColorsField(required=False) tags_colors = TagsColorsField(required=False)
users = serializers.SerializerMethodField("get_users") users = serializers.SerializerMethodField("get_users")
total_closed_milestones = serializers.SerializerMethodField("get_total_closed_milestones") total_closed_milestones = serializers.SerializerMethodField("get_total_closed_milestones")
userstory_custom_attributes = serializers.SerializerMethodField("get_userstory_custom_attributes")
task_custom_attributes = serializers.SerializerMethodField("get_task_custom_attributes")
issue_custom_attributes = serializers.SerializerMethodField("get_issue_custom_attributes")
class Meta: class Meta:
model = models.Project model = models.Project
@ -303,15 +301,6 @@ class ProjectSerializer(ModelSerializer):
raise serializers.ValidationError("Total milestones must be major or equal to zero") raise serializers.ValidationError("Total milestones must be major or equal to zero")
return attrs return attrs
def get_userstory_custom_attributes(self, obj):
return UserStoryCustomAttributeSerializer(obj.userstorycustomattributes.all(), many=True).data
def get_task_custom_attributes(self, obj):
return TaskCustomAttributeSerializer(obj.taskcustomattributes.all(), many=True).data
def get_issue_custom_attributes(self, obj):
return IssueCustomAttributeSerializer(obj.issuecustomattributes.all(), many=True).data
class ProjectDetailSerializer(ProjectSerializer): class ProjectDetailSerializer(ProjectSerializer):
roles = serializers.SerializerMethodField("get_roles") roles = serializers.SerializerMethodField("get_roles")
memberships = serializers.SerializerMethodField("get_memberships") memberships = serializers.SerializerMethodField("get_memberships")
@ -322,6 +311,12 @@ class ProjectDetailSerializer(ProjectSerializer):
issue_types = IssueTypeSerializer(many=True, required=False) issue_types = IssueTypeSerializer(many=True, required=False)
priorities = PrioritySerializer(many=True, required=False) # Issues priorities = PrioritySerializer(many=True, required=False) # Issues
severities = SeveritySerializer(many=True, required=False) 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)
def get_memberships(self, obj): def get_memberships(self, obj):
qs = obj.memberships.filter(user__isnull=False) qs = obj.memberships.filter(user__isnull=False)