From 1996efa0c7d5d35a14e77004352c4edfba330e4d Mon Sep 17 00:00:00 2001 From: Jessica McKellar Date: Tue, 18 Sep 2012 10:22:37 -0400 Subject: [PATCH] Give json_success/error the ability to add more data to the results json. (imported from commit 8fafb983f30e193905616eafa3be2f8aec1143c3) --- zephyr/views.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/zephyr/views.py b/zephyr/views.py index 1fcb056b50..50cb9ab99f 100644 --- a/zephyr/views.py +++ b/zephyr/views.py @@ -28,15 +28,17 @@ def require_post(view_func): return view_func(request, *args, **kwargs) return _wrapped_view_func -def json_response(res_type="success", msg="", status=200): - return HttpResponse(content=simplejson.dumps({"result":res_type, "msg":msg}), +def json_response(res_type="success", msg="", data={}, status=200): + content = {"result":res_type, "msg":msg} + content.update(data) + return HttpResponse(content=simplejson.dumps(content), mimetype='application/json', status=status) -def json_success(): - return json_response() +def json_success(data={}): + return json_response(data=data) -def json_error(msg): - return json_response(res_type="error", msg=msg, status=400) +def json_error(msg, data={}): + return json_response(res_type="error", msg=msg, data=data, status=400) def sanitize_identifier(x): """Sanitize a username, class name, etc."""