From: Ricardo Dias Date: Thu, 29 Mar 2018 08:59:27 +0000 (+0100) Subject: mgr/dashboard: restcontroller: allow DELETE to return JSON body X-Git-Tag: v13.1.0~234^2~24 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9e62b76e4f2a0c722cf04ac90f5ad7ffc77128d8;p=ceph-ci.git mgr/dashboard: restcontroller: allow DELETE to return JSON body Signed-off-by: Ricardo Dias --- diff --git a/src/pybind/mgr/dashboard/controllers/__init__.py b/src/pybind/mgr/dashboard/controllers/__init__.py index e0a25e56315..c0cef53c1e5 100644 --- a/src/pybind/mgr/dashboard/controllers/__init__.py +++ b/src/pybind/mgr/dashboard/controllers/__init__.py @@ -409,8 +409,7 @@ class RESTController(BaseController): if cherrypy.request.method not in ['GET', 'DELETE']: method = RESTController._takes_json(method) - if cherrypy.request.method != 'DELETE': - method = RESTController._returns_json(method) + method = RESTController._returns_json(method) cherrypy.response.status = status_code