Skip to content

erp5
erp5
Commit 7fe887d2 authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

Renderjs datetime field default to now 

Hey @romain, I noticed default to now was not implemented in renderjs ui.

Here, I implemented it server side to be consistent with erp5_xhtml_style ui where default to now is in server time zone.

/cc @gabriel 


/reviewed-on nexedi/erp5!73
parents 88440307 5f6c6ecb
Hide whitespace changes
Inline Side-by-side
Showing with 164 additions and 4 deletions
bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/ERP5Document_getHateoas.py
View file @ 7fe887d2
...@@ -185,6 +185,8 @@ def renderField(traversed_document, field, form_relative_url, value=None, meta_t ...@@ -185,6 +185,8 @@ def renderField(traversed_document, field, form_relative_url, value=None, meta_t
"hidden_day_is_last_day": field.get_value('hidden_day_is_last_day'), "hidden_day_is_last_day": field.get_value('hidden_day_is_last_day'),
} }
date_value = getFieldDefault(traversed_document, field, result["key"], value) date_value = getFieldDefault(traversed_document, field, result["key"], value)
if not date_value and field.get_value('default_now'):
date_value = DateTime()
if same_type(date_value, DateTime()): if same_type(date_value, DateTime()):
# Serialize DateTime # Serialize DateTime
date_value = date_value.rfc822() date_value = date_value.rfc822()
......
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_zuite/datetimefield_zuite/testDateTimeDefaultToNow.xml 0 → 100644
View file @ 7fe887d2
<?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>testDateTimeDefaultToNow</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_zuite/datetimefield_zuite/testDateTimeDefaultToNow.zpt 0 → 100644
View file @ 7fe887d2
<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 RenderJS UI: DateTimeField Default to now</title>
</head>
<body>
<table cellpadding="1" cellspacing="1" border="1">
<thead>
<tr><td rowspan="1" colspan="3">Test RenderJS UI: DateTimeField Default to now</td></tr>
</thead><tbody>
<tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/init" />
<!-- Clean Up -->
<tr>
<td>open</td>
<td>${base_url}/bar_module/ListBoxZuite_reset</td>
<td></td>
</tr>
<tr>
<td>assertTextPresent</td>
<td>Reset Successfully.</td>
<td></td>
</tr>
<!-- Initialize -->
<tr>
<td>open</td>
<td>${base_url}/web_site_module/renderjs_runner/#/bar_module</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//a[@data-i18n='Add']</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>link=Add</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//button[@data-i18n='Proceed']</td>
<td></td>
</tr>
<tr>
<td>select</td>
<td>//select[@name='field_your_portal_type']</td>
<td>label=Bar</td>
</tr>
<tr>
<td>click</td>
<td>//button[@data-i18n='Proceed']</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//a[@data-i18n='Tabs']</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>//a[@data-i18n='Tabs']</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//a[@data-i18n='DateTimeField']</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>//a[@data-i18n='DateTimeField']</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//input[@name='field_my_start_date']</td>
<td></td>
</tr>
<tr>
<td>storeEval</td>
<td>(new Date()).toISOString().substring(0, 10);</td>
<td>now</td>
</tr>
<tr>
<td>verifyValue</td>
<td>//input[@name='field_my_start_date']</td>
<td>glob:${now}*</td>
</tr>
</tbody></table>
</body>
</html>
\ No newline at end of file
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_zuite/datetimefield_zuite/testInvalidDateTime.zpt
View file @ 7fe887d2
...@@ -78,13 +78,13 @@ ...@@ -78,13 +78,13 @@
<tr> <tr>
<td>waitForElementPresent</td> <td>waitForElementPresent</td>
<td>//input[@name='field_my_start_date']</td> <td>//input[@name='field_my_stop_date']</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>type</td> <td>type</td>
<td>//input[@name='field_my_start_date']</td> <td>//input[@name='field_my_stop_date']</td>
<td>9915-14-21T11:00</td> <td>9915-14-21T11:00</td>
</tr> </tr>
...@@ -121,14 +121,14 @@ ...@@ -121,14 +121,14 @@
<tr> <tr>
<td>waitForElementPresent</td> <td>waitForElementPresent</td>
<td>//input[@name='field_my_start_date']</td> <td>//input[@name='field_my_stop_date']</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>verifyValue</td> <td>verifyValue</td>
<td>//input[@name='field_my_start_date']</td> <td>//input[@name='field_my_stop_date']</td>
<td></td> <td></td>
</tr> </tr>
</tbody></table> </tbody></table>
......
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