Forráskód Böngészése

fix(api): improve some error messages

Peter Thomassen 6 éve
szülő
commit
95092f9d99

+ 1 - 1
api/desecapi/models.py

@@ -152,7 +152,7 @@ class Domain(models.Model, mixins.SetterMixin):
 
 
     def clean(self):
     def clean(self):
         if self._dirtyName:
         if self._dirtyName:
-            raise ValidationError('You must not change the domain name')
+            raise ValidationError('You must not change the domain name.')
 
 
     @property
     @property
     def keys(self):
     def keys(self):

+ 1 - 1
api/desecapi/tests/testdomains.py

@@ -108,7 +108,7 @@ class AuthenticatedDomainTests(APITestCase):
         newname = utils.generateDomainname()
         newname = utils.generateDomainname()
         response.data['name'] = newname
         response.data['name'] = newname
         response = self.client.put(url, json.dumps(response.data), content_type='application/json')
         response = self.client.put(url, json.dumps(response.data), content_type='application/json')
-        self.assertEqual(response.status_code, status.HTTP_409_CONFLICT)
+        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
         response = self.client.get(url)
         response = self.client.get(url)
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(response.data['name'], self.ownedDomains[1].name)
         self.assertEqual(response.data['name'], self.ownedDomains[1].name)

+ 1 - 3
api/desecapi/views.py

@@ -176,9 +176,7 @@ class DomainDetail(generics.RetrieveUpdateDestroyAPIView):
         try:
         try:
             return super().update(request, *args, **kwargs)
             return super().update(request, *args, **kwargs)
         except django.core.exceptions.ValidationError as e:
         except django.core.exceptions.ValidationError as e:
-            ex = ValidationError(detail={"detail": str(e)})
-            ex.status_code = status.HTTP_409_CONFLICT
-            raise ex
+            raise ValidationError(detail={"detail": e.message})
 
 
 
 
 class RRsetDetail(generics.RetrieveUpdateDestroyAPIView):
 class RRsetDetail(generics.RetrieveUpdateDestroyAPIView):