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

perf: 工单提示信息优化

pull/7189/head
feng626 2021-11-12 17:32:22 +08:00 committed by xinwen
parent 187977c04a
commit 4a786baf4e
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,14 +77,19 @@ class ApplySerializer(serializers.Serializer):
type = self.root.initial_data['meta'].get('apply_type') type = self.root.initial_data['meta'].get('apply_type')
org_id = self.root.initial_data.get('org_id') org_id = self.root.initial_data.get('org_id')
with tmp_to_org(org_id): with tmp_to_org(org_id):
applications = Application.objects.filter(id__in=apply_applications, type=type).values_list('id', flat=True) applications = Application.objects.filter(
id__in=apply_applications, type=type
).values_list('id', flat=True)
return list(applications) return list(applications)
def validate(self, attrs): def validate(self, attrs):
apply_date_start = attrs['apply_date_start'] apply_date_start = attrs['apply_date_start'].strftime('%Y-%m-%d %H:%M:%S')
apply_date_expired = attrs['apply_date_expired'] apply_date_expired = attrs['apply_date_expired'].strftime('%Y-%m-%d %H:%M:%S')
if apply_date_expired <= apply_date_start: if apply_date_expired <= apply_date_start:
error = _('The expiration date should be greater than the start date') error = _('The expiration date should be greater than the start date')
raise serializers.ValidationError({'apply_date_expired': error}) raise serializers.ValidationError({'apply_date_expired': error})
attrs['apply_date_start'] = apply_date_start
attrs['apply_date_expired'] = apply_date_expired
return attrs return attrs

7
apps/tickets/serializers/ticket/meta/ticket_type/apply_asset.py
View File

@ -64,10 +64,13 @@ class ApplySerializer(serializers.Serializer):
)) ))
def validate(self, attrs): def validate(self, attrs):
apply_date_start = attrs['apply_date_start'] apply_date_start = attrs['apply_date_start'].strftime('%Y-%m-%d %H:%M:%S')
apply_date_expired = attrs['apply_date_expired'] apply_date_expired = attrs['apply_date_expired'].strftime('%Y-%m-%d %H:%M:%S')
if apply_date_expired <= apply_date_start: if apply_date_expired <= apply_date_start:
error = _('The expiration date should be greater than the start date') error = _('The expiration date should be greater than the start date')
raise serializers.ValidationError({'apply_date_expired': error}) raise serializers.ValidationError({'apply_date_expired': error})
attrs['apply_date_start'] = apply_date_start
attrs['apply_date_expired'] = apply_date_expired
return attrs return attrs