github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #7102 from jumpserver/pr@dev@ticket_tips 

perf: 工单错误提示优化
pull/7103/head
feng626 2021-10-28 15:25:42 +08:00 committed by GitHub
parent 2e4b6d150a 3ae8da231a
commit 09d4228182
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/tickets/serializers/ticket/meta/ticket_type/apply_application.py
View File

@ -80,12 +80,11 @@ class ApplySerializer(serializers.Serializer):
applications = Application.objects.filter(id__in=apply_applications, type=type).values_list('id', flat=True)
return list(applications)
def validate_apply_date_expired(self, value):
date_start = self.root.initial_data['meta'].get('apply_date_start')
date_start = datetime.strptime(date_start, '%Y-%m-%dT%H:%M:%S.%fZ')
date_expired = self.root.initial_data['meta'].get('apply_date_expired')
date_expired = datetime.strptime(date_expired, '%Y-%m-%dT%H:%M:%S.%fZ')
if date_expired <= date_start:
def validate(self, attrs):
apply_date_start = attrs['apply_date_start']
apply_date_expired = attrs['apply_date_expired']
if apply_date_expired <= apply_date_start:
error = _('The expiration date should be greater than the start date')
raise serializers.ValidationError(error)
return value
raise serializers.ValidationError({'apply_date_expired': error})
return attrs

2
apps/tickets/serializers/ticket/ticket.py
View File

@ -160,7 +160,7 @@ class TicketFlowApproveSerializer(serializers.ModelSerializer):
def validate(self, attrs):
if attrs['strategy'] == TicketApprovalStrategy.custom_user and not attrs.get('assignees'):
error = _('Please select the Assignees')
raise serializers.ValidationError(error)
raise serializers.ValidationError({'assignees': error})
return super().validate(attrs)