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
Labels
Merge Requests
7
Merge Requests
7
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
Jérome Perrin
erp5
Commits
60b0435b
Commit
60b0435b
authored
Mar 13, 2018
by
Xiaowu Zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_hal_json_style: multicheckbox return correctly item array
parent
57354f01
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
49 additions
and
2 deletions
+49
-2
bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/ERP5Document_getHateoas.py
...rtal_skins/erp5_hal_json_style/ERP5Document_getHateoas.py
+1
-1
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_multi_check_box_field_zuite/testEmptyMultiCheckBoxField.zpt
...lti_check_box_field_zuite/testEmptyMultiCheckBoxField.zpt
+48
-1
No files found.
bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/ERP5Document_getHateoas.py
View file @
60b0435b
...
...
@@ -683,7 +683,7 @@ def renderField(traversed_document, field, form, value=None, meta_type=None, key
if
meta_type
in
(
"CheckBoxField"
,
"MultiCheckBoxField"
):
if
meta_type
==
"MultiCheckBoxField"
:
result
[
"items"
]
=
toBasicTypes
(
field
.
get_value
(
"items"
))
,
result
[
"items"
]
=
toBasicTypes
(
field
.
get_value
(
"items"
))
return
result
if
meta_type
==
"GadgetField"
:
...
...
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_multi_check_box_field_zuite/testEmptyMultiCheckBoxField.zpt
View file @
60b0435b
...
...
@@ -55,14 +55,61 @@
<!-- Go to test form -->
<tal:block
metal:use-macro=
"here/Zuite_CommonTemplateForRenderjsUi/macros/go_to_bar_dummy_multicheckbox_field_report_view"
/>
<!-- Run test form & check -->
<tal:block
metal:use-macro=
"here/Zuite_CommonTemplateForRenderjsUi/macros/submit_dialog"
/>
<tr>
<td>
waitForTextPresent
</td>
<td>
repr []
</td>
<td></td>
</tr>
<tal:block
metal:use-macro=
"here/Zuite_CommonTemplateForRenderjsUi/macros/go_to_bar_dummy_multicheckbox_field_report_view"
/>
<tr>
<td>
waitForElementPresent
</td>
<td>
//span[@data-gadget-scope="a"]//input
</td>
<td></td>
</tr>
<tr>
<td>
click
</td>
<td>
//span[@data-gadget-scope="a"]//input
</td>
<td></td>
</tr>
<!-- Run test form & check -->
<tal:block
metal:use-macro=
"here/Zuite_CommonTemplateForRenderjsUi/macros/submit_dialog"
/>
<tr>
<td>
waitForTextPresent
</td>
<td>
repr ['a']
</td>
<td></td>
</tr>
<tal:block
metal:use-macro=
"here/Zuite_CommonTemplateForRenderjsUi/macros/go_to_bar_dummy_multicheckbox_field_report_view"
/>
<tr>
<td>
waitForElementPresent
</td>
<td>
//span[@data-gadget-scope="b"]//input
</td>
<td></td>
</tr>
<tr>
<td>
click
</td>
<td>
//span[@data-gadget-scope="b"]//input
</td>
<td></td>
</tr>
<!-- Run test form & check -->
<tal:block
metal:use-macro=
"here/Zuite_CommonTemplateForRenderjsUi/macros/submit_dialog"
/>
<tr>
<td>
waitForTextPresent
</td>
<td>
repr ['b']
</td>
<td></td>
</tr>
</tbody></table>
</body>
</html>
\ No newline at end of file
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