Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow HttpResponse objects to be returned from ajax functions #89

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dajaxice/tests/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ def test_calling_registered_function_with_params(self):
def test_bad_function(self):

response = self.client.post('/dajaxice/dajaxice.tests.test_ajax_exception/')
self.failUnlessEqual(response.status_code, 200)
self.failUnlessEqual(response.status_code, 500)
self.failUnlessEqual(response.content, "DAJAXICE_EXCEPTION")

def test_get_register(self):
Expand Down
7 changes: 6 additions & 1 deletion dajaxice/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,18 @@ def dispatch(self, request, name=None):
data = {}

# Call the function. If something goes wrong, handle the Exception
status = 200
try:
response = function.call(request, **data)
except Exception:
if settings.DEBUG:
raise
response = dajaxice_config.DAJAXICE_EXCEPTION
status = 500

return HttpResponse(response, mimetype="application/x-json")
if isinstance(response, basestring):
return HttpResponse(response, status=status, mimetype="application/json")
else:
return response
else:
raise FunctionNotCallableError(name)