Skip to content

Commit 8281b33

Browse files
committed
Allow for normal get and post delete, and ajax get delete.
Needed for sigurdga#12 and sigurdga#14
1 parent ea20c29 commit 8281b33

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

fileupload/views.py

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from fileupload.models import Picture
22
from django.views.generic import CreateView, DeleteView
33

4-
from django.http import HttpResponse
4+
from django.http import HttpResponse, HttpResponseRedirect
55
from django.utils import simplejson
66
from django.core.urlresolvers import reverse
77

@@ -35,9 +35,12 @@ def delete(self, request, *args, **kwargs):
3535
"""
3636
self.object = self.get_object()
3737
self.object.delete()
38-
response = JSONResponse(True, {}, response_mimetype(self.request))
39-
response['Content-Disposition'] = 'inline; filename=files.json'
40-
return response
38+
if request.is_ajax():
39+
response = JSONResponse(True, {}, response_mimetype(self.request))
40+
response['Content-Disposition'] = 'inline; filename=files.json'
41+
return response
42+
else:
43+
return HttpResponseRedirect('/upload/new')
4144

4245
class JSONResponse(HttpResponse):
4346
"""JSON response class."""

0 commit comments

Comments
 (0)