Skip to content

erp5
erp5
Commit b072a620 authored by Tomáš Peterka's avatar Tomáš Peterka Committed by Tomáš Peterka
Browse files
Options

[renderjs_ui] Listbox uses templates fields even though they are not defined in "editable columns" 

This should fix bug 2071215-1637B3D
The fix was done by removing (commenting out) code which was making ERP5 possible to somehow use offline with the new UI.
Now the possibility is shrinking in favour of backward compatibility.
parent 87788944
Hide whitespace changes
Inline Side-by-side
Showing with 238 additions and 2 deletions
bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/ERP5Document_getHateoas.py
View file @ b072a620
...@@ -621,7 +621,9 @@ def renderField(traversed_document, field, form, value=None, meta_type=None, key ...@@ -621,7 +621,9 @@ def renderField(traversed_document, field, form, value=None, meta_type=None, key
if param_key not in list_method.params(): # we search in raw string if param_key not in list_method.params(): # we search in raw string
del list_method_query_dict[param_key] # but it is enough del list_method_query_dict[param_key] # but it is enough
if (editable_column_list): if (True): # editable_column_list (used to be but we need
# template fields resolution (issued by existence of `form_relative_url`)
# to always kick in
list_method_custom = url_template_dict["custom_search_template"] % { list_method_custom = url_template_dict["custom_search_template"] % {
"root_url": site_root.absolute_url(), "root_url": site_root.absolute_url(),
"script_id": script.id, "script_id": script.id,
...@@ -631,6 +633,10 @@ def renderField(traversed_document, field, form, value=None, meta_type=None, key ...@@ -631,6 +633,10 @@ def renderField(traversed_document, field, form, value=None, meta_type=None, key
"default_param_json": urlsafe_b64encode(json.dumps(list_method_query_dict)) "default_param_json": urlsafe_b64encode(json.dumps(list_method_query_dict))
} }
list_method_query_dict = {} list_method_query_dict = {}
"""
# We commented out this part because of backward compatibility
# The problem seems to be that template fields for listboxes are
# used in the old UI even though they are not listed in "editable columns"
elif (list_method_name == "portal_catalog"): elif (list_method_name == "portal_catalog"):
pass pass
elif (list_method_name == "searchFolder"): elif (list_method_name == "searchFolder"):
...@@ -644,6 +650,7 @@ def renderField(traversed_document, field, form, value=None, meta_type=None, key ...@@ -644,6 +650,7 @@ def renderField(traversed_document, field, form, value=None, meta_type=None, key
"default_param_json": urlsafe_b64encode(json.dumps(list_method_query_dict)) "default_param_json": urlsafe_b64encode(json.dumps(list_method_query_dict))
} }
list_method_query_dict = {} list_method_query_dict = {}
"""
# row_list = list_method(limit=lines, portal_type=portal_types, # row_list = list_method(limit=lines, portal_type=portal_types,
# **default_params) # **default_params)
......
bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/FooModule_viewFooList.xml
View file @ b072a620
...@@ -73,7 +73,6 @@ ...@@ -73,7 +73,6 @@
<value> <value>
<list> <list>
<string>listbox</string> <string>listbox</string>
<string>listbox_delivery_start_date</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -83,6 +82,8 @@ ...@@ -83,6 +82,8 @@
<list> <list>
<string>listbox_id</string> <string>listbox_id</string>
<string>listbox_subject_list</string> <string>listbox_subject_list</string>
<string>listbox_delivery_start_date</string>
<string>listbox_causality_title</string>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/FooModule_viewFooList/listbox_causality_title.xml 0 → 100644
View file @ b072a620
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>default</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>listbox_causality_title</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>default</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_editor_field</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string encoding="cdata"><![CDATA[
string:<div class="hello">Couscous</div>
]]></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testEditableColumnBackwardCompatibility.xml 0 → 100644
View file @ b072a620
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>content_type</string> </key>
<value> <string>text/html</string> </value>
</item>
<item>
<key> <string>expand</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>testEditableColumnBackwardCompatibility</string> </value>
</item>
<item>
<key> <string>output_encoding</string> </key>
<value> <string>utf-8</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <unicode></unicode> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testEditableColumnBackwardCompatibility.zpt 0 → 100644
View file @ b072a620
<html xmlns:tal="http://xml.zope.org/namespaces/tal"
xmlns:metal="http://xml.zope.org/namespaces/metal">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Test ListBox Fast Save</title>
</head>
<body>
<table cellpadding="1" cellspacing="1" border="1">
<thead>
<tr><td rowspan="1" colspan="3">Test custom "default" value rendering inside editor field</td></tr>
</thead><tbody>
<tr><td>store</td>
<td>https://softinst81338.host.vifib.net/erp5</td>
<td>base_url</td></tr>
<tal:block metal:use-macro="here/PTZuite_CommonTemplate/macros/init" />
<tr><td>open</td>
<td>${base_url}/foo_module/ListBoxZuite_reset</td><td></td></tr>
<tr><td>assertTextPresent</td>
<td>Reset Successfully.</td><td></td></tr>
<tr><td>open</td>
<td>${base_url}/foo_module/FooModule_createObjects?start:int=1&amp;num:int=2&amp;create_line:int=0</td><td></td></tr>
<tr><td>assertTextPresent</td>
<td>Created Successfully.</td><td></td></tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/wait_for_activities" />
<tr><td>open</td>
<td>${base_url}/foo_module/1/Foo_setCausality?value=foo_module/2</td><td></td></tr>
<tr><td>assertTextPresent</td>
<td>Set Successfully.</td><td></td></tr>
<!-- Set causality_reference_title as listbox columns
Do not put it in editable columns because the template field resolution must work always (backward compatibility)
-->
<tr><td>open</td>
<td>${base_url}/foo_module/FooModule_viewFooList/listbox/ListBox_setPropertyList?field_columns=id%7CID%0Acausality_title%7CCausality</td>
<td></td></tr>
<tr><td>assertTextPresent</td>
<td>Set Successfully.</td><td></td></tr>
<!-- Shortcut for full renderjs url -->
<tr><td>store</td>
<td>${base_url}/web_site_module/renderjs_runner</td>
<td>renderjs_url</td></tr>
<tr><td>open</td>
<td>${renderjs_url}/#/foo_module</td><td></td></tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_listbox_loaded" />
<!-- Listbox does have template field for causality BUT does not declare it in "editable columns" -->
<!-- Foo 2 without causality set -->
<tr><td>waitForElementPresent</td>
<td>//div[@data-gadget-scope="field_listbox"]//table/tbody/tr[1]/td[2]//div[@class="hello"]</td><td></td></tr>
<tr><td>assertText</td>
<td>//div[@data-gadget-scope="field_listbox"]//table/tbody/tr[1]/td[2]//div[@class="hello"]</td>
<td>Couscous</td></tr>
</tbody></table>
</body>
</html>
\ No newline at end of file
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7