Skip to content

erp5
erp5
Commit bfaaef72 authored by Xiaowu Zhang's avatar Xiaowu Zhang
Browse files
Options

erp5_web_renderjs_ui: display correctly when anchor column is checked

parent a8470353
Show whitespace changes
Inline Side-by-side
Showing with 187 additions and 14 deletions
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_html.xml
View file @ bfaaef72
...@@ -159,8 +159,10 @@ ...@@ -159,8 +159,10 @@
<tbody class="tbody">\n <tbody class="tbody">\n
{{#each body_value}}\n {{#each body_value}}\n
<tr>\n <tr>\n
{{#if ../../show_anchor}}\n {{#if ../show_anchor}}\n
<th class="ui-link ui-btn ui-corner-all ui-icon-carat-r ui-btn-icon-notext"></th>\n <th>\n
<a class="ui-link ui-btn ui-corner-all ui-icon-carat-r ui-btn-icon-notext" href="{{jump}}" </a>\n
</th>\n
{{/if}}\n {{/if}}\n
{{#each tr_value}}\n {{#each tr_value}}\n
<th>\n <th>\n
...@@ -189,8 +191,10 @@ ...@@ -189,8 +191,10 @@
<tbody class="tbody">\n <tbody class="tbody">\n
{{#each body_value}}\n {{#each body_value}}\n
<tr>\n <tr>\n
{{#if ../../show_anchor}}\n {{#if ../show_anchor}}\n
<th class="ui-link ui-btn ui-corner-all ui-icon-carat-r ui-btn-icon-notext"></th>\n <th>\n
<a class="ui-link ui-btn ui-corner-all ui-icon-carat-r ui-btn-icon-notext" href="{{jump}}" </a>\n
</th>\n
{{/if}}\n {{/if}}\n
<th>\n <th>\n
<input value="{{value}}" type="checkbox" checked="true" class="hide_element">\n <input value="{{value}}" type="checkbox" checked="true" class="hide_element">\n
...@@ -408,7 +412,7 @@ ...@@ -408,7 +412,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>949.10973.23622.18261</string> </value> <value> <string>949.25555.60712.7731</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -426,7 +430,7 @@ ...@@ -426,7 +430,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1455551894.43</float> <float>1456426878.51</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_js.xml
View file @ bfaaef72
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
return gadget.translateHtml(template(\n return gadget.translateHtml(template(\n
{\n {\n
"body_value": gadget.props.body_value,\n "body_value": gadget.props.body_value,\n
"show_ancher": gadget.props.field_json.show_anchor,\n "show_anchor": gadget.props.field_json.show_anchor,\n
"column_list": gadget.props.field_json.column_list\n "column_list": gadget.props.field_json.column_list\n
}\n }\n
))\n ))\n
...@@ -535,6 +535,7 @@ ...@@ -535,6 +535,7 @@
}\n }\n
body_value.push({\n body_value.push({\n
"value": result.data.rows[i].value.uid,\n "value": result.data.rows[i].value.uid,\n
"jump": tmp_url,\n
"tr_value": tr_value\n "tr_value": tr_value\n
});\n });\n
}\n }\n
...@@ -563,7 +564,7 @@ ...@@ -563,7 +564,7 @@
\n \n
}).push(function (url_list) {\n }).push(function (url_list) {\n
var foot = {};\n var foot = {};\n
foot.colspan = field_json.column_list.length;\n foot.colspan = field_json.column_list.length + gadget.props.field_json.show_anchor;\n
foot.default_colspan = foot.colspan;\n foot.default_colspan = foot.colspan;\n
foot.previous_classname = "ui-btn ui-icon-carat-l ui-btn-icon-left responsive ui-first-child";\n foot.previous_classname = "ui-btn ui-icon-carat-l ui-btn-icon-left responsive ui-first-child";\n
foot.previous_url = url_list[0];\n foot.previous_url = url_list[0];\n
...@@ -871,7 +872,7 @@ ...@@ -871,7 +872,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>949.16516.37897.4249</string> </value> <value> <string>949.25536.57875.14165</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -889,7 +890,7 @@ ...@@ -889,7 +890,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1455899151.12</float> <float>1456426686.64</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testAnchorColumn.xml 0 → 100644
View file @ bfaaef72
<?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>_text</string> </key>
<value> <unicode encoding="cdata"><![CDATA[
<html xmlns:tal="http://xml.zope.org/namespaces/tal"\n
xmlns:metal="http://xml.zope.org/namespaces/metal">\n
<head>\n
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">\n
<title>Test RenderJS UI</title>\n
</head>\n
<body>\n
<table cellpadding="1" cellspacing="1" border="1">\n
<thead>\n
<tr><td rowspan="1" colspan="3">Test RenderJS UI</td></tr>\n
</thead><tbody>\n
<tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/init" />\n
\n
<!-- Clean Up -->\n
<tr>\n
<td>open</td>\n
<td>${base_url}/bar_module/ListBoxZuite_reset</td>\n
<td></td>\n
</tr>\n
\n
<tr>\n
<td>assertTextPresent</td>\n
<td>Reset Successfully.</td>\n
<td></td>\n
</tr>\n
\n
<tr>\n
<td>open</td>\n
<td>${base_url}/foo_module/FooModule_createObjects</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>assertTextPresent</td>\n
<td>Created Successfully.</td>\n
<td></td>\n
</tr>\n
\n
\n
<tr>\n
<td>open</td>\n
<td>${base_url}/foo_module/FooModule_viewFooList/listbox/ListBox_setPropertyList?field_anchor=1</td>\n
<td></td>\n
</tr>\n
\n
<tr>\n
<td>assertTextPresent</td>\n
<td>Set Successfully.</td>\n
<td></td>\n
</tr>\n
\n
<tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/wait_for_activities" />\n
\n
\n
<!-- Initialize -->\n
<tr>\n
<td>open</td>\n
<td>${base_url}/web_site_module/renderjs_runner/#/foo_module</td>\n
<td></td>\n
</tr>\n
\n
<tr>\n
<td>waitForElementPresent</td>\n
<td>//a[@data-i18n=\'Previous\']</td>\n
<td></td>\n
</tr>\n
\n
<tr>\n
<td>waitForElementPresent</td>\n
<td>//a[contains(@class, "ui-icon-carat-r")]</td>\n
<td></td>\n
</tr>\n
\n
<tr>\n
<td>verifyElementPresent</td>\n
<td>//a[contains(@class, "ui-icon-carat-r")]</td>\n
<td></td>\n
</tr>\n
\n
<tr>\n
<td>click</td>\n
<td>//button[@data-i18n="Hide Rows"]</td>\n
<td></td>\n
</tr>\n
\n
\n
<tr>\n
<td>waitForElementPresent</td>\n
<td>//a[contains(@class, "ui-icon-carat-r")]</td>\n
<td></td>\n
</tr>\n
\n
<tr>\n
<td>verifyElementPresent</td>\n
<td>//a[contains(@class, "ui-icon-carat-r")]</td>\n
<td></td>\n
</tr>\n
\n
\n
\n
\n
</tbody></table>\n
</body>\n
</html>
]]></unicode> </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>testAnchorColumn</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>
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