]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
mgr/dashboard: restcontroller: allow DELETE to return JSON body
authorRicardo Dias <rdias@suse.com>
Thu, 29 Mar 2018 08:59:27 +0000 (09:59 +0100)
committerRicardo Dias <rdias@suse.com>
Fri, 13 Apr 2018 14:58:47 +0000 (15:58 +0100)
Signed-off-by: Ricardo Dias <rdias@suse.com>
src/pybind/mgr/dashboard/controllers/__init__.py

index e0a25e56315ae82bc1ac4eac26eefb2fef961fea..c0cef53c1e598899eb9f305f69fb52501bc4cac7 100644 (file)
@@ -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