Skip to content

erp5
erp5
Commit 20b04347 authored by Romain Courteaud's avatar Romain Courteaud
Browse files
Options

erp5_web_renderjs_ui: handle empty string value for float percent 

erp5_ui_test: check empty percent
parent f4825819
Pipeline #13430 failed with stage
    Hide whitespace changes
    Inline Side-by-side
    Showing with 260 additions and 3 deletions
    bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/Foo_viewFloatField.xml
    View file @ 20b04347
    ...@@ -100,6 +100,7 @@ ...@@ -100,6 +100,7 @@
    <string>your_first_failure</string> <string>your_first_failure</string>
    <string>my_delivery_ratio</string> <string>my_delivery_ratio</string>
    <string>my_delivery_ratio_read_only</string> <string>my_delivery_ratio_read_only</string>
    <string>your_empty_percent</string>
    </list> </list>
    </value> </value>
    </item> </item>
    ......
    bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/Foo_viewFloatField/your_empty_percent.xml 0 → 100644
    View file @ 20b04347
    <?xml version="1.0"?>
    <ZopeData>
    <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
    <global name="FloatField" module="Products.Formulator.StandardFields"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>id</string> </key>
    <value> <string>your_empty_percent</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>
    <item>
    <key> <string>not_float</string> </key>
    <value> <string>You did not enter a floating point number.</string> </value>
    </item>
    <item>
    <key> <string>required_not_found</string> </key>
    <value> <string>Input is required but no input given.</string> </value>
    </item>
    </dictionary>
    </value>
    </item>
    <item>
    <key> <string>overrides</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>alternate_name</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>css_class</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>default</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>description</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>display_maxwidth</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>display_width</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>editable</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>enabled</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>external_validator</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>extra</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>hidden</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>input_style</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>precision</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>required</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>title</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>whitespace_preserve</string> </key>
    <value> <string></string> </value>
    </item>
    </dictionary>
    </value>
    </item>
    <item>
    <key> <string>tales</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>alternate_name</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>css_class</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>default</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>description</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>display_maxwidth</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>display_width</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>editable</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>enabled</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>external_validator</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>extra</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>hidden</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>input_style</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>input_type</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>precision</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>required</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>title</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>whitespace_preserve</string> </key>
    <value> <string></string> </value>
    </item>
    </dictionary>
    </value>
    </item>
    <item>
    <key> <string>values</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>alternate_name</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>css_class</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>default</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>description</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>display_maxwidth</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>display_width</string> </key>
    <value> <int>20</int> </value>
    </item>
    <item>
    <key> <string>editable</string> </key>
    <value> <int>0</int> </value>
    </item>
    <item>
    <key> <string>enabled</string> </key>
    <value> <int>1</int> </value>
    </item>
    <item>
    <key> <string>external_validator</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>extra</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>hidden</string> </key>
    <value> <int>0</int> </value>
    </item>
    <item>
    <key> <string>input_style</string> </key>
    <value> <string>-12.3%</string> </value>
    </item>
    <item>
    <key> <string>input_type</string> </key>
    <value> <string>text</string> </value>
    </item>
    <item>
    <key> <string>precision</string> </key>
    <value> <int>1</int> </value>
    </item>
    <item>
    <key> <string>required</string> </key>
    <value> <int>0</int> </value>
    </item>
    <item>
    <key> <string>title</string> </key>
    <value> <string>Empty Percent</string> </value>
    </item>
    <item>
    <key> <string>whitespace_preserve</string> </key>
    <value> <int>0</int> </value>
    </item>
    </dictionary>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_floatfield_js.js
    View file @ 20b04347
    ...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
    } }
    if (input_style === PERCENT_INPUT_STYLE) { if (input_style === PERCENT_INPUT_STYLE) {
    if (text[text.length - 1] !== '%') { if (text && text[text.length - 1] !== '%') {
    throw new Error('Can not parse: ' + text); throw new Error('Can not parse: ' + text);
    } }
    return text.substring(0, text.length - 1); return text.substring(0, text.length - 1);
    ......
    bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_floatfield_js.xml
    View file @ 20b04347
    ...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
    </item> </item>
    <item> <item>
    <key> <string>serial</string> </key> <key> <string>serial</string> </key>
    <value> <string>989.39131.12225.13038</string> </value> <value> <string>989.47346.45852.48913</string> </value>
    </item> </item>
    <item> <item>
    <key> <string>state</string> </key> <key> <string>state</string> </key>
    ...@@ -252,7 +252,7 @@ ...@@ -252,7 +252,7 @@
    </tuple> </tuple>
    <state> <state>
    <tuple> <tuple>
    <float>1611676581.15</float> <float>1612176955.25</float>
    <string>UTC</string> <string>UTC</string>
    </tuple> </tuple>
    </state> </state>
    ......
    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