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

perf: 工单错误提示优化

apps/tickets/serializers/ticket/meta/ticket_type/apply_application.py

@@ -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):
+    def validate(self, attrs):
-        date_start = self.root.initial_data['meta'].get('apply_date_start')
+        apply_date_start = attrs['apply_date_start']
-        date_start = datetime.strptime(date_start, '%Y-%m-%dT%H:%M:%S.%fZ')
+        apply_date_expired = attrs['apply_date_expired']
-        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 apply_date_expired <= apply_date_start:
-        if date_expired <= date_start:
             error = _('The expiration date should be greater than the start date')
-            raise serializers.ValidationError(error)
+            raise serializers.ValidationError({'apply_date_expired': error})
-        return value
+        return attrs

apps/tickets/serializers/ticket/ticket.py

@@ -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)