Commit 0065de9b authored by Romain Courteaud's avatar Romain Courteaud

Check that DateTimeField (and ProxyField of DateTimeField) does not lose the...

Check that DateTimeField (and ProxyField of DateTimeField) does not lose the value entered by the user when the validation failed.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@13893 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 7db7ff2b
......@@ -165,7 +165,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>testInvalidDateTime</string> </value>
<value> <string>testInitializeWithInvalidDateTime</string> </value>
</item>
<item>
<key> <string>title</string> </key>
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<tuple>
<string>Products.PageTemplates.ZopePageTemplate</string>
<string>ZopePageTemplate</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<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> <string 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 Invalid DateTime</title>\n
</head>\n
<body>\n
<table cellpadding="1" cellspacing="1" border="1">\n
<thead>\n
<tr><td rowspan="1" colspan="3">Test Invalid DateTime</td></tr>\n
</thead><tbody>\n
<tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/init" />\n
<tr>\n
<td>open</td>\n
<td>${base_url}/foo_module/FooModule_createObjects?num:int=1</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>assertTextPresent</td>\n
<td>Created Successfully.</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>open</td>\n
<td>${base_url}/foo_module/ListBoxZuite_waitForActivities</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>assertTextPresent</td>\n
<td>Done.</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>open</td>\n
<td>${base_url}/foo_module/0/Foo_viewDateTimeField</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>clickAndWait</td>\n
<td>//button[@title=\'Save\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>assertTextPresent</td>\n
<td>Data Updated.</td>\n
<td></td>\n
</tr>\n
\n
<tr>\n
<td>type</td>\n
<td>subfield_field_my_start_date_year</td>\n
<td>9999</td>\n
</tr>\n
<tr>\n
<td>type</td>\n
<td>subfield_field_my_start_date_month</td>\n
<td>88</td>\n
</tr>\n
<tr>\n
<td>type</td>\n
<td>subfield_field_my_start_date_day</td>\n
<td>77</td>\n
</tr>\n
<tr>\n
<td>type</td>\n
<td>subfield_field_my_start_date_hour</td>\n
<td>66</td>\n
</tr>\n
<tr>\n
<td>type</td>\n
<td>subfield_field_my_start_date_minute</td>\n
<td>99</td>\n
</tr>\n
<tr>\n
<td>clickAndWait</td>\n
<td>//button[@title=\'Save\']</td>\n
<td></td>\n
</tr>\n
\n
<tr>\n
<td>verifyValue</td>\n
<td>subfield_field_my_start_date_year</td>\n
<td>9999</td>\n
</tr>\n
<tr>\n
<td>verifyValue</td>\n
<td>subfield_field_my_start_date_month</td>\n
<td>88</td>\n
</tr>\n
<tr>\n
<td>verifyValue</td>\n
<td>subfield_field_my_start_date_day</td>\n
<td>77</td>\n
</tr>\n
<tr>\n
<td>verifyValue</td>\n
<td>subfield_field_my_start_date_hour</td>\n
<td>66</td>\n
</tr>\n
<tr>\n
<td>verifyValue</td>\n
<td>subfield_field_my_start_date_minute</td>\n
<td>99</td>\n
</tr>\n
<tr>\n
<td>assertTextPresent</td>\n
<td>You did not enter a valid date and time.</td>\n
<td></td>\n
</tr>\n
\n
</tbody></table>\n
</body>\n
</html>\n
\n
]]></string> </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>testSurchargeWithInvalidDateTime</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
......@@ -165,7 +165,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>testInvalidDateTime</string> </value>
<value> <string>testInitialiseWithInvalidDateTime</string> </value>
</item>
<item>
<key> <string>title</string> </key>
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<tuple>
<string>Products.PageTemplates.ZopePageTemplate</string>
<string>ZopePageTemplate</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<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> <string 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 Invalid DateTime</title>\n
</head>\n
<body>\n
<table cellpadding="1" cellspacing="1" border="1">\n
<thead>\n
<tr><td rowspan="1" colspan="3">Test Invalid DateTime</td></tr>\n
</thead><tbody>\n
<tal:block metal:use-macro="here/RelationFieldZuite_CommonTemplate/macros/init" />\n
<tr>\n
<td>open</td>\n
<td>${base_url}/foo_module/FooModule_createObjects?num:int=1</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>assertTextPresent</td>\n
<td>Created Successfully.</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>open</td>\n
<td>${base_url}/foo_module/ListBoxZuite_waitForActivities</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>assertTextPresent</td>\n
<td>Done.</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>open</td>\n
<td>${base_url}/foo_module/0/Foo_viewProxyField</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>clickAndWait</td>\n
<td>//button[@title=\'Save\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>assertTextPresent</td>\n
<td>Data Updated.</td>\n
<td></td>\n
</tr>\n
\n
<tr>\n
<td>type</td>\n
<td>subfield_field_my_start_date_year</td>\n
<td>9999</td>\n
</tr>\n
<tr>\n
<td>type</td>\n
<td>subfield_field_my_start_date_month</td>\n
<td>88</td>\n
</tr>\n
<tr>\n
<td>type</td>\n
<td>subfield_field_my_start_date_day</td>\n
<td>77</td>\n
</tr>\n
<tr>\n
<td>type</td>\n
<td>subfield_field_my_start_date_hour</td>\n
<td>66</td>\n
</tr>\n
<tr>\n
<td>type</td>\n
<td>subfield_field_my_start_date_minute</td>\n
<td>99</td>\n
</tr>\n
<tr>\n
<td>clickAndWait</td>\n
<td>//button[@title=\'Save\']</td>\n
<td></td>\n
</tr>\n
\n
<tr>\n
<td>verifyValue</td>\n
<td>subfield_field_my_start_date_year</td>\n
<td>9999</td>\n
</tr>\n
<tr>\n
<td>verifyValue</td>\n
<td>subfield_field_my_start_date_month</td>\n
<td>88</td>\n
</tr>\n
<tr>\n
<td>verifyValue</td>\n
<td>subfield_field_my_start_date_day</td>\n
<td>77</td>\n
</tr>\n
<tr>\n
<td>verifyValue</td>\n
<td>subfield_field_my_start_date_hour</td>\n
<td>66</td>\n
</tr>\n
<tr>\n
<td>verifyValue</td>\n
<td>subfield_field_my_start_date_minute</td>\n
<td>99</td>\n
</tr>\n
<tr>\n
<td>assertTextPresent</td>\n
<td>You did not enter a valid date and time.</td>\n
<td></td>\n
</tr>\n
\n
</tbody></table>\n
</body>\n
</html>\n
\n
]]></string> </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>testSurchargeWithInvalidDateTime</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
189
\ No newline at end of file
191
\ 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