Commit 801ff6ab authored by Romain Courteaud's avatar Romain Courteaud

erp5_web_renderjs_ui: fix FloatField percent rendering

Mimic xhtml style.
parent 412c5411
...@@ -118,6 +118,7 @@ ...@@ -118,6 +118,7 @@
<list> <list>
<string>my_quantity</string> <string>my_quantity</string>
<string>my_quantity_read_only</string> <string>my_quantity_read_only</string>
<string>my_quantity_read_only_percent</string>
<string>my_frozen</string> <string>my_frozen</string>
<string>my_lines_list</string> <string>my_lines_list</string>
</list> </list>
......
...@@ -49,16 +49,16 @@ ...@@ -49,16 +49,16 @@
}, },
tmp; tmp;
if (!window.isNaN(state_dict.precision)) {
state_dict.step = Math.pow(10, -state_dict.precision);
state_dict.value = state_dict.value.toFixed(state_dict.precision);
}
if (percentage) { if (percentage) {
// ERP5 always devides the value by 100 if it is set to percentages // ERP5 always devides the value by 100 if it is set to percentages
// thus we have to mitigate that in javascript here // thus we have to mitigate that in javascript here
state_dict.value *= 100.0; state_dict.value *= 100.0;
state_dict.append = "%"; state_dict.append = "%";
} }
if (!window.isNaN(state_dict.precision)) {
state_dict.step = Math.pow(10, -state_dict.precision);
state_dict.value = state_dict.value.toFixed(state_dict.precision);
}
if (!window.isNaN(state_dict.value)) { if (!window.isNaN(state_dict.value)) {
state_dict.text_content = state_dict.value.toString(); state_dict.text_content = state_dict.value.toString();
if (state_dict.text_content !== "" && thousand_sep !== "") { if (state_dict.text_content !== "" && thousand_sep !== "") {
......
...@@ -45,10 +45,10 @@ ...@@ -45,10 +45,10 @@
data_attr; data_attr;
if (!isEmpty(this.state.text_content)) { if (!isEmpty(this.state.text_content)) {
if (this.state.prepend) { if (this.state.prepend) {
content = this.state.prepend + "&nbsp;" + content; content = this.state.prepend + content;
} }
if (this.state.append) { if (this.state.append) {
content = content + "&nbsp;" + this.state.append; content = content + this.state.append;
} }
new_element.textContent = content; new_element.textContent = content;
} else if (!isEmpty(this.state.inner_html)) { } else if (!isEmpty(this.state.inner_html)) {
......
...@@ -142,114 +142,122 @@ ...@@ -142,114 +142,122 @@
</record> </record>
<record id="3" aka="AAAAAAAAAAM="> <record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/> <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
</pickle> </pickle>
<pickle> <pickle>
<tuple> <dictionary>
<none/> <item>
<list> <key> <string>_log</string> </key>
<dictionary> <value>
<item> <list>
<key> <string>action</string> </key> <dictionary>
<value> <string>publish_alive</string> </value> <item>
</item> <key> <string>action</string> </key>
<item> <value> <string>publish_alive</string> </value>
<key> <string>actor</string> </key> </item>
<value> <string>zope</string> </value> <item>
</item> <key> <string>actor</string> </key>
<item> <value> <string>zope</string> </value>
<key> <string>comment</string> </key> </item>
<value> <string></string> </value> <item>
</item> <key> <string>comment</string> </key>
<item> <value> <string></string> </value>
<key> <string>error_message</string> </key> </item>
<value> <string></string> </value> <item>
</item> <key> <string>error_message</string> </key>
<item> <value> <string></string> </value>
<key> <string>time</string> </key> </item>
<value> <item>
<object> <key> <string>time</string> </key>
<klass> <value>
<global name="DateTime" module="DateTime.DateTime"/> <object>
</klass> <klass>
<tuple> <global name="DateTime" module="DateTime.DateTime"/>
<none/> </klass>
</tuple> <tuple>
<state> <none/>
<tuple> </tuple>
<float>1514233719.27</float> <state>
<string>UTC</string> <tuple>
</tuple> <float>1514233719.27</float>
</state> <string>UTC</string>
</object> </tuple>
</value> </state>
</item> </object>
<item> </value>
<key> <string>validation_state</string> </key> </item>
<value> <string>published_alive</string> </value> <item>
</item> <key> <string>validation_state</string> </key>
</dictionary> <value> <string>published_alive</string> </value>
</list> </item>
</tuple> </dictionary>
</list>
</value>
</item>
</dictionary>
</pickle> </pickle>
</record> </record>
<record id="4" aka="AAAAAAAAAAQ="> <record id="4" aka="AAAAAAAAAAQ=">
<pickle> <pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/> <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
</pickle> </pickle>
<pickle> <pickle>
<tuple> <dictionary>
<none/> <item>
<list> <key> <string>_log</string> </key>
<dictionary> <value>
<item> <list>
<key> <string>action</string> </key> <dictionary>
<value> <string>edit</string> </value> <item>
</item> <key> <string>action</string> </key>
<item> <value> <string>edit</string> </value>
<key> <string>actor</string> </key> </item>
<value> <string>zope</string> </value> <item>
</item> <key> <string>actor</string> </key>
<item> <value> <string>zope</string> </value>
<key> <string>comment</string> </key> </item>
<value> <item>
<none/> <key> <string>comment</string> </key>
</value> <value>
</item> <none/>
<item> </value>
<key> <string>error_message</string> </key> </item>
<value> <string></string> </value> <item>
</item> <key> <string>error_message</string> </key>
<item> <value> <string></string> </value>
<key> <string>serial</string> </key> </item>
<value> <string>967.44748.35225.6109</string> </value> <item>
</item> <key> <string>serial</string> </key>
<item> <value> <string>982.42532.14902.56951</string> </value>
<key> <string>state</string> </key> </item>
<value> <string>current</string> </value> <item>
</item> <key> <string>state</string> </key>
<item> <value> <string>current</string> </value>
<key> <string>time</string> </key> </item>
<value> <item>
<object> <key> <string>time</string> </key>
<klass> <value>
<global name="DateTime" module="DateTime.DateTime"/> <object>
</klass> <klass>
<tuple> <global name="DateTime" module="DateTime.DateTime"/>
<none/> </klass>
</tuple> <tuple>
<state> <none/>
<tuple> </tuple>
<float>1536228266.13</float> <state>
<string>UTC</string> <tuple>
</tuple> <float>1584701796.37</float>
</state> <string>UTC</string>
</object> </tuple>
</value> </state>
</item> </object>
</dictionary> </value>
</list> </item>
</tuple> </dictionary>
</list>
</value>
</item>
</dictionary>
</pickle> </pickle>
</record> </record>
</ZopeData> </ZopeData>
...@@ -43,6 +43,9 @@ ...@@ -43,6 +43,9 @@
<tr><td>verifyText</td> <tr><td>verifyText</td>
<td>//div[@data-gadget-scope="field_my_quantity_read_only"]//p</td> <td>//div[@data-gadget-scope="field_my_quantity_read_only"]//p</td>
<td>1 000 000.0</td></tr> <td>1 000 000.0</td></tr>
<tr><td>verifyText</td>
<td>//div[@data-gadget-scope="field_my_quantity_read_only_percent"]//p</td>
<td>100000000.0%</td></tr>
<!-- default quantity has to be 0 <!-- default quantity has to be 0
This is regression test for bug #20171208-5E8D43 This is regression test for bug #20171208-5E8D43
......
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