Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Cédric Le Ninivin
erp5
Commits
28758dba
Commit
28758dba
authored
Apr 15, 2024
by
Titouan Soulard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_api_style: FIXUP return
parent
3c8360da
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
10 deletions
+10
-10
bt5/erp5_api_style/SkinTemplateItem/portal_skins/erp5_api_style/ERP5Site_asjIOStyle.py
...teItem/portal_skins/erp5_api_style/ERP5Site_asjIOStyle.py
+8
-10
bt5/erp5_api_style/SkinTemplateItem/portal_skins/erp5_api_style/ERP5Site_logApiErrorAndReturn.py
...tal_skins/erp5_api_style/ERP5Site_logApiErrorAndReturn.py
+2
-0
No files found.
bt5/erp5_api_style/SkinTemplateItem/portal_skins/erp5_api_style/ERP5Site_asjIOStyle.py
View file @
28758dba
...
...
@@ -64,13 +64,13 @@ if not data_dict:
try
:
data
=
json_loads_byteified
(
text_content
)
except
BaseException
as
e
:
portal
.
ERP5Site_logApiErrorAndReturn
(
return
portal
.
ERP5Site_logApiErrorAndReturn
(
error_code
=
400
,
error_message
=
str
(
e
),
error_name
=
"API-JSON-INVALID-JSON"
,
)
if
not
isinstance
(
data
,
dict
):
portal
.
ERP5Site_logApiErrorAndReturn
(
return
portal
.
ERP5Site_logApiErrorAndReturn
(
error_code
=
400
,
error_message
=
"Did not received a JSON Object"
,
error_name
=
"API-JSON-NOT-JSON-OBJECT"
,
...
...
@@ -85,13 +85,13 @@ if mode in ("get", "put"):
try
:
document_id
=
data
[
"id"
]
except
KeyError
:
portal
.
ERP5Site_logApiErrorAndReturn
(
return
portal
.
ERP5Site_logApiErrorAndReturn
(
error_code
=
400
,
error_message
=
"Cannot find id property"
,
error_name
=
"API-JSON-NO-ID-PROPERTY"
,
)
except
TypeError
:
portal
.
ERP5Site_logApiErrorAndReturn
(
return
portal
.
ERP5Site_logApiErrorAndReturn
(
error_code
=
400
,
error_message
=
"Did not received a JSON Object"
,
error_name
=
"API-JSON-NOT-JSON-OBJECT"
,
...
...
@@ -124,14 +124,14 @@ for erp5_action_key in erp5_action_dict.keys():
document
,
view_action
[
'id'
],
data
,
list_error
=
True
)
match
=
True
# If an object is created, 201 code is exp
t
ected
# If an object is created, 201 code is expected
if
mode
==
"post"
:
if
response
.
getStatus
()
<
400
:
response
.
setStatus
(
201
)
return
result
except
ValueError
as
e
:
if
mode
in
(
"put"
,
"get"
):
portal
.
ERP5Site_logApiErrorAndReturn
(
return
portal
.
ERP5Site_logApiErrorAndReturn
(
error_code
=
400
,
error_message
=
"Data did not match schema: %s"
%
str
(
e
),
error_name
=
"API-JSON-SCHEMA-ERROR"
,
...
...
@@ -155,9 +155,7 @@ if not match:
error_message
=
"Data did not validate against interface schemas"
if
error_dict
:
error_kw
[
"detail_list"
]
=
sorted
(
error_dict
.
items
())
portal
.
ERP5Site_logApiErrorAndReturn
(
error_message
,
return
portal
.
ERP5Site_logApiErrorAndReturn
(
error_message
=
error_message
,
**
error_kw
)
raise
ValueError
(
"Unreachable code reached"
)
bt5/erp5_api_style/SkinTemplateItem/portal_skins/erp5_api_style/ERP5Site_logApiErrorAndReturn.py
View file @
28758dba
...
...
@@ -27,3 +27,5 @@ if detail_list:
context
.
REQUEST
.
response
.
setHeader
(
"Content-Type"
,
"application/json"
)
context
.
REQUEST
.
response
.
setStatus
(
error_code
,
lock
=
True
)
context
.
REQUEST
.
response
.
setBody
(
json
.
dumps
(
error_dict
,
indent
=
2
),
lock
=
True
)
return
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment