Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
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
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ayush Tiwari
erp5
Commits
e5c0ed20
Commit
e5c0ed20
authored
Aug 31, 2017
by
Tomáš Peterka
Committed by
Tomáš Peterka
Sep 01, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[json_style] Refactor Base_edit, Add MatrixBox and FloatField.input_style to getHateoas
parent
77d44328
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
147 additions
and
133 deletions
+147
-133
bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Base_edit.py
...emplateItem/portal_skins/erp5_hal_json_style/Base_edit.py
+106
-98
bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/ERP5Document_getHateoas.py
...rtal_skins/erp5_hal_json_style/ERP5Document_getHateoas.py
+41
-35
No files found.
bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Base_edit.py
View file @
e5c0ed20
...
@@ -51,7 +51,8 @@ except FormValidationError as validation_errors:
...
@@ -51,7 +51,8 @@ except FormValidationError as validation_errors:
value
=
request
.
get
(
field_id
)
value
=
request
.
get
(
field_id
)
if
callable
(
value
):
if
callable
(
value
):
value
(
request
)
value
(
request
)
if
silent_mode
:
return
context
.
ERP5Document_getHateoas
(
form
=
form
,
REQUEST
=
request
,
mode
=
'form'
),
'form'
if
silent_mode
:
return
context
.
ERP5Document_getHateoas
(
form
=
form
,
REQUEST
=
request
,
mode
=
'form'
),
'form'
request
.
RESPONSE
.
setStatus
(
400
)
request
.
RESPONSE
.
setStatus
(
400
)
return
context
.
ERP5Document_getHateoas
(
form
=
form
,
REQUEST
=
request
,
mode
=
'form'
)
return
context
.
ERP5Document_getHateoas
(
form
=
form
,
REQUEST
=
request
,
mode
=
'form'
)
...
@@ -92,7 +93,9 @@ def editListBox(listbox_field, listbox):
...
@@ -92,7 +93,9 @@ def editListBox(listbox_field, listbox):
def
editMatrixBox
(
matrixbox_field
,
matrixbox
):
def
editMatrixBox
(
matrixbox_field
,
matrixbox
):
""" Function called to edit a Matrix box
""" Function called to edit a Matrix box
"""
"""
if
matrixbox
is
not
None
:
if
matrixbox
is
None
:
return
cell_base_id
=
matrixbox_field
.
get_value
(
'cell_base_id'
)
cell_base_id
=
matrixbox_field
.
get_value
(
'cell_base_id'
)
portal_type
=
matrixbox_field
.
get_value
(
'cell_portal_type'
)
portal_type
=
matrixbox_field
.
get_value
(
'cell_portal_type'
)
getter_method
=
matrixbox_field
.
get_value
(
'getter_method'
)
getter_method
=
matrixbox_field
.
get_value
(
'getter_method'
)
...
@@ -100,7 +103,10 @@ def editMatrixBox(matrixbox_field, matrixbox):
...
@@ -100,7 +103,10 @@ def editMatrixBox(matrixbox_field, matrixbox):
matrix_context
=
getattr
(
context
,
getter_method
)()
matrix_context
=
getattr
(
context
,
getter_method
)()
else
:
else
:
matrix_context
=
context
matrix_context
=
context
if
matrix_context
is
not
None
:
if
matrix_context
is
None
:
return
kd
=
{}
kd
=
{}
kd
[
'portal_type'
]
=
portal_type
kd
[
'portal_type'
]
=
portal_type
kd
[
'base_id'
]
=
cell_base_id
kd
[
'base_id'
]
=
cell_base_id
...
@@ -163,32 +169,33 @@ def editMatrixBox(matrixbox_field, matrixbox):
...
@@ -163,32 +169,33 @@ def editMatrixBox(matrixbox_field, matrixbox):
if
cell_range
!=
matrixbox_cell_range
:
if
cell_range
!=
matrixbox_cell_range
:
matrix_context
.
setCellRange
(
base_id
=
cell_base_id
,
*
matrixbox_cell_range
)
matrix_context
.
setCellRange
(
base_id
=
cell_base_id
,
*
matrixbox_cell_range
)
for
k
,
v
in
matrixbox
.
items
():
for
cell_index_tuple
,
cell_value_dict
in
matrixbox
.
items
():
# Only update cells which still exist
# Only update cells which still exist
if
matrix_context
.
hasInRange
(
*
k
,
**
kd
):
if
not
matrix_context
.
hasInRange
(
*
cell_index_tuple
,
**
kd
):
c
=
matrix_context
.
newCell
(
*
k
,
**
kd
)
return
"Cell %s does not exist"
%
str
(
cell_index_tuple
)
if
c
is
not
None
:
c
.
edit
(
edit_order
=
edit_order
,
**
gv
)
# First update globals which include the def. of property_list
cell
=
matrix_context
.
newCell
(
*
cell_index_tuple
,
**
kd
)
if
v
.
has_key
(
'variated_property'
):
if
cell
is
None
:
return
"Could not create cell %s"
%
str
(
cell_index_tuple
)
cell
.
edit
(
edit_order
=
edit_order
,
**
gv
)
# First update globals which include the def. of property_list
if
cell_value_dict
.
has_key
(
'variated_property'
):
# For Variated Properties
# For Variated Properties
value
=
v
[
'variated_property'
]
value
=
cell_value_dict
[
'variated_property'
]
del
v
[
'variated_property'
]
del
cell_value_dict
[
'variated_property'
]
if
gv
.
has_key
(
'mapped_value_property_list'
):
if
gv
.
has_key
(
'mapped_value_property_list'
):
# Change the property which is defined by the
# Change the property which is defined by the
# first element of mapped_value_property_list
# first element of mapped_value_property_list
# XXX Kato: What? Why?
# XXX May require some changes with Sets
# XXX May require some changes with Sets
key
=
gv
[
'mapped_value_property_list'
][
0
]
key
=
gv
[
'mapped_value_property_list'
][
0
]
v
[
key
]
=
value
cell_value_dict
[
key
]
=
value
# Form: '' -> ERP5: None
# Form: '' -> ERP5: None
cleaned_v
=
v
.
copy
()
cleaned_v
=
cell_value_dict
.
copy
()
for
key
,
value
in
cleaned_v
.
items
():
for
key
,
value
in
cleaned_v
.
items
():
if
value
==
''
:
if
value
==
''
:
cleaned_v
[
key
]
=
None
cleaned_v
[
key
]
=
None
c
.
edit
(
edit_order
=
edit_order
,
**
cleaned_v
)
# and update the cell specific values
cell
.
edit
(
edit_order
=
edit_order
,
**
cleaned_v
)
# and update the cell specific values
else
:
return
"Could not create cell %s"
%
str
(
k
)
else
:
return
"Cell %s does not exist"
%
str
(
k
)
edit_kwargs
=
{}
# keyword arguments for `edit` function on context
edit_kwargs
=
{}
# keyword arguments for `edit` function on context
...
@@ -220,7 +227,8 @@ try:
...
@@ -220,7 +227,8 @@ try:
editMatrixBox
(
field
,
request
.
get
(
field
.
id
))
editMatrixBox
(
field
,
request
.
get
(
field
.
id
))
# Return parsed values
# Return parsed values
if
silent_mode
:
return
(
edit_kwargs
,
encapsulated_editor_list
),
'edit'
if
silent_mode
:
return
(
edit_kwargs
,
encapsulated_editor_list
),
'edit'
# Maybe we should build a list of objects we need
# Maybe we should build a list of objects we need
# Update basic attributes
# Update basic attributes
...
...
bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/ERP5Document_getHateoas.py
View file @
e5c0ed20
...
@@ -94,7 +94,7 @@ def getFieldDefault(traversed_document, field, key, value=None):
...
@@ -94,7 +94,7 @@ def getFieldDefault(traversed_document, field, key, value=None):
return
result
return
result
def
renderField
(
traversed_document
,
field
,
form
_relative_url
,
value
=
None
,
meta_type
=
None
,
key
=
None
,
key_prefix
=
None
,
selection_params
=
None
):
def
renderField
(
traversed_document
,
field
,
form
,
value
=
None
,
meta_type
=
None
,
key
=
None
,
key_prefix
=
None
,
selection_params
=
None
):
"""Extract important field's attributes into `result` dictionary."""
"""Extract important field's attributes into `result` dictionary."""
if
meta_type
is
None
:
if
meta_type
is
None
:
...
@@ -120,7 +120,7 @@ def renderField(traversed_document, field, form_relative_url, value=None, meta_t
...
@@ -120,7 +120,7 @@ def renderField(traversed_document, field, form_relative_url, value=None, meta_t
})
})
if
meta_type
==
"ProxyField"
:
if
meta_type
==
"ProxyField"
:
return
renderField
(
traversed_document
,
field
,
form
_relative_url
,
value
,
return
renderField
(
traversed_document
,
field
,
form
,
value
,
meta_type
=
field
.
getRecursiveTemplateField
().
meta_type
,
meta_type
=
field
.
getRecursiveTemplateField
().
meta_type
,
key
=
key
,
key_prefix
=
key_prefix
,
key
=
key
,
key_prefix
=
key_prefix
,
selection_params
=
selection_params
)
selection_params
=
selection_params
)
...
@@ -151,7 +151,10 @@ def renderField(traversed_document, field, form_relative_url, value=None, meta_t
...
@@ -151,7 +151,10 @@ def renderField(traversed_document, field, form_relative_url, value=None, meta_t
"LinesField"
,
"ImageField"
,
"FileField"
,
"IntegerField"
,
"LinesField"
,
"ImageField"
,
"FileField"
,
"IntegerField"
,
"PasswordField"
,
"EditorField"
):
"PasswordField"
,
"EditorField"
):
if
meta_type
==
"FloatField"
:
if
meta_type
==
"FloatField"
:
result
[
"precision"
]
=
field
.
get_value
(
"precision"
)
result
.
update
({
"precision"
:
field
.
get_value
(
"precision"
),
"input_style"
:
field
.
get_value
(
"input_style"
),
})
if
meta_type
==
"ImageField"
:
if
meta_type
==
"ImageField"
:
options
=
{
options
=
{
'display'
:
field
.
get_value
(
'image_display'
),
'display'
:
field
.
get_value
(
'image_display'
),
...
@@ -231,7 +234,7 @@ def renderField(traversed_document, field, form_relative_url, value=None, meta_t
...
@@ -231,7 +234,7 @@ def renderField(traversed_document, field, form_relative_url, value=None, meta_t
# find listbox field
# find listbox field
listbox_form_field
=
filter
(
lambda
f
:
f
.
getId
()
==
listbox_field_name
,
form
.
get_fields
())[
0
]
listbox_form_field
=
filter
(
lambda
f
:
f
.
getId
()
==
listbox_field_name
,
form
.
get_fields
())[
0
]
# get original definition
# get original definition
subfield
=
renderField
(
context
,
listbox_form_field
,
getFormRelativeUrl
(
form
)
)
subfield
=
renderField
(
context
,
listbox_form_field
,
form
)
# overwrite, like Base_getRelatedObjectParameter does
# overwrite, like Base_getRelatedObjectParameter does
if
subfield
[
"portal_type"
]
==
[]:
if
subfield
[
"portal_type"
]
==
[]:
subfield
[
"portal_type"
]
=
field
.
get_value
(
'portal_type'
)
subfield
[
"portal_type"
]
=
field
.
get_value
(
'portal_type'
)
...
@@ -331,7 +334,7 @@ def renderField(traversed_document, field, form_relative_url, value=None, meta_t
...
@@ -331,7 +334,7 @@ def renderField(traversed_document, field, form_relative_url, value=None, meta_t
"root_url"
:
site_root
.
absolute_url
(),
"root_url"
:
site_root
.
absolute_url
(),
"script_id"
:
script
.
id
,
"script_id"
:
script
.
id
,
"relative_url"
:
traversed_document
.
getRelativeUrl
().
replace
(
"/"
,
"%2F"
),
"relative_url"
:
traversed_document
.
getRelativeUrl
().
replace
(
"/"
,
"%2F"
),
"form_relative_url"
:
"%s/%s"
%
(
form_relative_url
,
field
.
id
),
"form_relative_url"
:
"%s/%s"
%
(
getFormRelativeUrl
(
form
)
,
field
.
id
),
"list_method"
:
list_method_name
,
"list_method"
:
list_method_name
,
"default_param_json"
:
urlsafe_b64encode
(
json
.
dumps
(
list_method_query_dict
))
"default_param_json"
:
urlsafe_b64encode
(
json
.
dumps
(
list_method_query_dict
))
}
}
...
@@ -416,13 +419,24 @@ def renderField(traversed_document, field, form_relative_url, value=None, meta_t
...
@@ -416,13 +419,24 @@ def renderField(traversed_document, field, form_relative_url, value=None, meta_t
}
}
return
result
return
result
if
meta_type
==
"MatrixBox"
:
# data are generated by python code for MatrixBox.py
# template_fields are better rendered here because they can be part of "hidden"
# group which is not rendered in form by default. Including
# those fields directly here saves a lot of headache later
template_field_names
=
[
"{}_{}"
.
format
(
field
.
id
,
editable_attribute
)
for
editable_attribute
,
_
in
field
.
get_value
(
'editable_attributes'
)]
result
.
update
({
'data'
:
field
.
render
(
key
=
key
,
value
=
value
,
REQUEST
=
REQUEST
,
render_format
=
'list'
),
'template_field_dict'
:
{
template_field
:
renderField
(
traversed_document
,
getattr
(
form
,
template_field
),
form
)
for
template_field
in
template_field_names
if
template_field
in
form
},
})
return
result
# All other fields are not implemented and we'll return only basic info about them
# All other fields are not implemented and we'll return only basic info about them
return
{
result
[
"_debug"
]
=
"Unknown field type "
+
meta_type
"type"
:
meta_type
,
return
result
"_debug"
:
"Unsupported field type"
,
"title"
:
Base_translateString
(
field
.
get_value
(
"title"
)),
"key"
:
key
,
}
def
renderForm
(
traversed_document
,
form
,
response_dict
,
key_prefix
=
None
,
selection_params
=
None
):
def
renderForm
(
traversed_document
,
form
,
response_dict
,
key_prefix
=
None
,
selection_params
=
None
):
...
@@ -475,31 +489,23 @@ def renderForm(traversed_document, form, response_dict, key_prefix=None, selecti
...
@@ -475,31 +489,23 @@ def renderForm(traversed_document, form, response_dict, key_prefix=None, selecti
'name'
:
form
.
id
'name'
:
form
.
id
}
}
# Go through all groups ("left", "bottom", "hidden" etc.) and add fields from
# them into form.
for
group
in
form
.
Form_getGroupTitleAndId
():
for
group
in
form
.
Form_getGroupTitleAndId
():
# Skipping hidden group could be problematic but see MatrixBox Field above
if
group
[
'gid'
].
find
(
'hidden'
)
<
0
:
if
'hidden'
in
group
[
'gid'
]
:
# field_list = []
continue
for
field
in
form
.
get_fields_in_group
(
group
[
'goid'
]):
for
field
in
form
.
get_fields_in_group
(
group
[
'goid'
]):
# field_list.append((field.id, renderRawField(field)))
if
not
field
.
get_value
(
"enabled"
):
if
field
.
get_value
(
"enabled"
):
continue
try
:
try
:
response_dict
[
field
.
id
]
=
renderField
(
traversed_document
,
field
,
form_relative_url
,
key_prefix
=
key_prefix
,
selection_params
=
selection_params
)
response_dict
[
field
.
id
]
=
renderField
(
traversed_document
,
field
,
form
,
key_prefix
=
key_prefix
,
selection_params
=
selection_params
)
if
field_errors
.
has_key
(
field
.
id
):
if
field_errors
.
has_key
(
field
.
id
):
response_dict
[
field
.
id
][
"error_text"
]
=
field_errors
[
field
.
id
].
error_text
response_dict
[
field
.
id
][
"error_text"
]
=
field_errors
[
field
.
id
].
error_text
except
AttributeError
:
except
AttributeError
:
# Do not crash if field configuration is wrong.
# Do not crash if field configuration is wrong.
pass
pass
# for field_group in field.form.get_groups():
# traversed_document.log("Field group: " + field_group)
# traversed_document.log(field_group)
# for field_property in field.form.get_fields_in_group(field_group):
# # traversed_document.log("Field attribute: " + field_property.id)
# # field.get_value(field_property.id)
# traversed_document.log(field_property)
# group_list.append((group['gid'], field_list))
response_dict
[
"form_id"
]
=
{
response_dict
[
"form_id"
]
=
{
"type"
:
"StringField"
,
"type"
:
"StringField"
,
"key"
:
"form_id"
,
"key"
:
"form_id"
,
...
@@ -1079,7 +1085,7 @@ def calculateHateoas(is_portal=None, is_site_root=None, traversed_document=None,
...
@@ -1079,7 +1085,7 @@ def calculateHateoas(is_portal=None, is_site_root=None, traversed_document=None,
else
:
else
:
tmp_value
=
getProtectedProperty
(
document
,
select
)
tmp_value
=
getProtectedProperty
(
document
,
select
)
property_value
=
renderField
(
traversed_document
,
editable_field_dict
[
select
],
form
_relative_url
,
property_value
=
renderField
(
traversed_document
,
editable_field_dict
[
select
],
form
,
tmp_value
,
tmp_value
,
key
=
'field_%s_%s'
%
(
editable_field_dict
[
select
].
id
,
key
=
'field_%s_%s'
%
(
editable_field_dict
[
select
].
id
,
document_uid
))
document_uid
))
...
...
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