encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-03 20:10:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge 3d54d4cd9a into add1260be4

Browse Source
This commit is contained in:
Jeroen Dekkers 2014-05-28 22:27:10 +00:00
commit af9cd98d96
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rest_framework/mixins.py
View File

@ -7,6 +7,7 @@ which allows mixin classes to be composed in interesting ways.
from __future__ import unicode_literals from __future__ import unicode_literals
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
from django.db.models import ProtectedError
from django.http import Http404 from django.http import Http404
from rest_framework import status from rest_framework import status
from rest_framework.response import Response from rest_framework.response import Response
@ -191,6 +192,9 @@ class DestroyModelMixin(object):
def destroy(self, request, *args, **kwargs): def destroy(self, request, *args, **kwargs):
obj = self.get_object() obj = self.get_object()
self.pre_delete(obj) self.pre_delete(obj)
obj.delete() try:
obj.delete()
except ProtectedError:
return Response('Cannot delete object because of protected foreign key relation', status=status.HTTP_409_CONFLICT)
self.post_delete(obj) self.post_delete(obj)
return Response(status=status.HTTP_204_NO_CONTENT) return Response(status=status.HTTP_204_NO_CONTENT)