Commit c7f87ef1 authored by Romain Courteaud's avatar Romain Courteaud

erp5_hal_json_style: set the locked status only at the end, to ensure...

erp5_hal_json_style: set the locked status only at the end, to ensure potential error are not returned with 201 status
parent cb171462
...@@ -30,18 +30,6 @@ if len(parameters): ...@@ -30,18 +30,6 @@ if len(parameters):
redirect_url = '%s%s%s' % (redirect_url, separator, parameters) redirect_url = '%s%s%s' % (redirect_url, separator, parameters)
# XXX Allow CORS
response = context.REQUEST.RESPONSE
context.Base_prepareCorsResponse(RESPONSE=response)
# http://en.wikipedia.org/wiki/Post/Redirect/Get
response.setStatus(201, lock=True)
response.setHeader("X-Location", "urn:jio:get:%s" % context.getRelativeUrl())
# be explicit with the reponse content type because in case of reports - they
# can be in text/plain, application/pdf ... so the RJS form needs to know what
# is going exactly on. ERP5Document_getHateoas returns application/hal+json
# therefor we don't need to be afraid of clashes
response.setHeader("Content-type", "application/json; charset=utf-8")
portal_status_level = keep_items.pop("portal_status_level", "success") portal_status_level = keep_items.pop("portal_status_level", "success")
if portal_status_level in ("warning", "error", "fatal"): if portal_status_level in ("warning", "error", "fatal"):
portal_status_level = "error" portal_status_level = "error"
...@@ -84,9 +72,22 @@ if (form_id not in [None, 'Base_viewFakePythonScriptActionForm', 'Base_viewFakeJ ...@@ -84,9 +72,22 @@ if (form_id not in [None, 'Base_viewFakePythonScriptActionForm', 'Base_viewFakeJ
) )
} }
# XXX Allow CORS
response = context.REQUEST.RESPONSE
context.Base_prepareCorsResponse(RESPONSE=response)
response.setHeader("X-Location", "urn:jio:get:%s" % context.getRelativeUrl())
# be explicit with the reponse content type because in case of reports - they
# can be in text/plain, application/pdf ... so the RJS form needs to know what
# is going exactly on. ERP5Document_getHateoas returns application/hal+json
# therefor we don't need to be afraid of clashes
response.setHeader("Content-type", "application/json; charset=utf-8")
result = json.dumps(result_dict, indent=2) result = json.dumps(result_dict, indent=2)
if abort_transaction: if abort_transaction:
response.setBody(result, lock=True) response.setBody(result, lock=True)
raise Redirect('') raise Redirect('')
# http://en.wikipedia.org/wiki/Post/Redirect/Get
response.setStatus(201, lock=True)
return result return result
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment