Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
This commit is contained in:
commit
afdd7a67ca
|
@ -50,6 +50,10 @@ class TransitionSerializer(CustomModelSerializer):
|
||||||
queryset = queryset.select_related('source_state', 'destination_state')
|
queryset = queryset.select_related('source_state', 'destination_state')
|
||||||
return queryset
|
return queryset
|
||||||
|
|
||||||
|
class TransitionSimpleSerializer(CustomModelSerializer):
|
||||||
|
class Meta:
|
||||||
|
model = Transition
|
||||||
|
fields = ['id', 'name', 'attribute_type']
|
||||||
|
|
||||||
class AllField(serializers.Field):
|
class AllField(serializers.Field):
|
||||||
def to_representation(self, value):
|
def to_representation(self, value):
|
||||||
|
@ -206,6 +210,7 @@ class TicketDetailSerializer(CustomModelSerializer):
|
||||||
class TicketFlowSerializer(CustomModelSerializer):
|
class TicketFlowSerializer(CustomModelSerializer):
|
||||||
participant_ = UserSimpleSerializer(source='participant', read_only=True)
|
participant_ = UserSimpleSerializer(source='participant', read_only=True)
|
||||||
state_ = StateSimpleSerializer(source='state', read_only=True)
|
state_ = StateSimpleSerializer(source='state', read_only=True)
|
||||||
|
transition_ = TransitionSimpleSerializer(source='transition', read_only=True)
|
||||||
transition_attribute = serializers.CharField(source='transition.attribute_type', read_only=True)
|
transition_attribute = serializers.CharField(source='transition.attribute_type', read_only=True)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
|
@ -216,6 +221,7 @@ class TicketFlowSerializer(CustomModelSerializer):
|
||||||
class TicketFlowSimpleSerializer(CustomModelSerializer):
|
class TicketFlowSimpleSerializer(CustomModelSerializer):
|
||||||
participant_ = UserSimpleSerializer(source='participant', read_only=True)
|
participant_ = UserSimpleSerializer(source='participant', read_only=True)
|
||||||
state_ = StateSimpleSerializer(source='state', read_only=True)
|
state_ = StateSimpleSerializer(source='state', read_only=True)
|
||||||
|
transition_ = TransitionSimpleSerializer(source='transition', read_only=True)
|
||||||
transition_attribute = serializers.CharField(source='transition.attribute_type', read_only=True)
|
transition_attribute = serializers.CharField(source='transition.attribute_type', read_only=True)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
|
|
Loading…
Reference in New Issue