Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Romain Courteaud
erp5
Commits
f27f9fde
Commit
f27f9fde
authored
Jan 24, 2018
by
Xiaowu Zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_web_renderjs_ui: display same datetime value when timezone style is unchecked in view mode
parent
7158a272
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
241 additions
and
11 deletions
+241
-11
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_datetimefield_js.js
...eItem/web_page_module/rjs_gadget_erp5_datetimefield_js.js
+7
-8
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_datetimefield_js.xml
...Item/web_page_module/rjs_gadget_erp5_datetimefield_js.xml
+3
-3
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_date_time_field_zuite/testDisplayWithAndWithoutTimeZone.xml
...te_time_field_zuite/testDisplayWithAndWithoutTimeZone.xml
+58
-0
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_date_time_field_zuite/testDisplayWithAndWithoutTimeZone.zpt
...te_time_field_zuite/testDisplayWithAndWithoutTimeZone.zpt
+173
-0
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_datetimefield_js.js
View file @
f27f9fde
...
@@ -226,7 +226,7 @@
...
@@ -226,7 +226,7 @@
.
push
(
function
(
gadget_list
)
{
.
push
(
function
(
gadget_list
)
{
var
text_content
=
""
,
var
text_content
=
""
,
state_date
,
state_date
,
o
ptions
;
o
ffset_time_zone
;
if
(
gadget
.
state
.
value
)
{
if
(
gadget
.
state
.
value
)
{
state_date
=
new
Date
(
gadget
.
state
.
value
);
state_date
=
new
Date
(
gadget
.
state
.
value
);
if
(
gadget
.
state
.
timezone_style
)
{
if
(
gadget
.
state
.
timezone_style
)
{
...
@@ -235,14 +235,13 @@
...
@@ -235,14 +235,13 @@
text_content
+=
"
"
+
state_date
.
toLocaleTimeString
();
text_content
+=
"
"
+
state_date
.
toLocaleTimeString
();
}
}
}
else
{
}
else
{
//
We don't know the timezone used by erp5 to store the date
//
get timezone difference between server and local browser
// display it as displayed in editable
offset_time_zone
=
timezone
+
(
state_date
.
getTimezoneOffset
()
/
60
);
options
=
{
timeZone
:
"
UTC
"
};
//adjust hour in order to get correct date time string
text_content
=
state_date
.
toLocaleDateString
(
undefined
,
state_date
.
setUTCHours
(
state_date
.
getUTCHours
()
+
offset_time_zone
);
options
);
text_content
=
state_date
.
toLocaleDateString
(
);
if
(
!
gadget
.
state
.
date_only
)
{
if
(
!
gadget
.
state
.
date_only
)
{
text_content
+=
"
"
+
state_date
.
toLocaleTimeString
(
undefined
,
text_content
+=
"
"
+
state_date
.
toLocaleTimeString
();
options
);
}
}
}
}
}
}
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_datetimefield_js.xml
View file @
f27f9fde
...
@@ -224,7 +224,7 @@
...
@@ -224,7 +224,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
96
4.26946.11355.11605
</string>
</value>
<value>
<string>
96
5.2047.43587.43144
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -242,8 +242,8 @@
...
@@ -242,8 +242,8 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
151
4370341.04
</float>
<float>
151
6809315.48
</float>
<string>
UTC
</string>
<string>
GMT+1
</string>
</tuple>
</tuple>
</state>
</state>
</object>
</object>
...
...
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_date_time_field_zuite/testDisplayWithAndWithoutTimeZone.xml
0 → 100644
View file @
f27f9fde
<?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>
testDisplayWithAndWithoutTimeZone
</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_date_time_field_zuite/testDisplayWithAndWithoutTimeZone.zpt
0 → 100644
View file @
f27f9fde
<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
</title>
</head>
<body>
<table
cellpadding=
"1"
cellspacing=
"1"
border=
"1"
>
<thead>
<tr><td
rowspan=
"1"
colspan=
"3"
>
Test RenderJS UI
</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>
<tal:block
metal:use-macro=
"here/Zuite_CommonTemplateForRenderjsUi/macros/submit_dialog"
/>
<tal:block
metal:use-macro=
"here/Zuite_CommonTemplateForRenderjsUi/macros/go_to_bar_datetime_field_view"
/>
<tr>
<td>
waitForElementPresent
</td>
<td>
//div[@data-gadget-scope='field_my_start_date']
</td>
<td></td>
</tr>
<tr>
<td>
type
</td>
<td>
//div[@data-gadget-scope='field_my_start_date']//input
</td>
<td>
2015-12-21T11:00
</td>
</tr>
<tr>
<td>
type
</td>
<td>
//div[@data-gadget-scope='field_my_stop_date']//input
</td>
<td>
2016-12-21T12:00
</td>
</tr>
<tr>
<td>
select
</td>
<td>
//div[@data-gadget-scope='field_my_stop_date']//select
</td>
<td>
GMT+5
</td>
</tr>
<tal:block
metal:use-macro=
"here/Zuite_CommonTemplateForRenderjsUi/macros/save"
/>
<tal:block
metal:use-macro=
"here/Zuite_CommonTemplateForRenderjsUi/macros/toggle_editable_mode"
/>
<tal:block
metal:use-macro=
"here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded"
/>
<tr>
<td>
assertElementPresent
</td>
<td>
//div[@data-gadget-scope='field_my_start_date']//div[@data-gadget-scope='field']//p[contains(text(), '11:00:00')]
</td>
<td></td>
</tr>
<tr>
<td>
assertElementPresent
</td>
<td>
//div[@data-gadget-scope='field_my_start_date']//div[@data-gadget-scope='field']//p[@data-date='2015-12-21T11:00:00']
</td>
<td></td>
</tr>
<tr>
<td>
storeLocation
</td>
<td>
url
</td>
<td></td>
</tr>
<tr>
<td>
open
</td>
<td>
${base_url}/Foo_viewDateTimeField/my_stop_date/manage_main
</td>
<td></td>
</tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
//input[@name='field_timezone_style']
</td>
<td></td>
</tr>
<tr>
<td>
click
</td>
<td>
//input[@name='field_timezone_style']
</td>
<td></td>
</tr>
<tr>
<td>
click
</td>
<td>
//input[@value='Save Changes']
</td>
<td></td>
</tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
//div[@class='system-msg']
</td>
<td></td>
</tr>
<tr>
<td>
open
</td>
<td>
${url}
</td>
<td></td>
</tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
//div[@data-gadget-scope='field_my_stop_date']//div[@data-gadget-scope='field']//p[@data-date='2016-12-21T12:00:00']
</td>
<td></td>
</tr>
<tr>
<td>
open
</td>
<td>
${base_url}/Foo_viewDateTimeField/my_stop_date/manage_main
</td>
<td></td>
</tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
//input[@name='field_timezone_style']
</td>
<td></td>
</tr>
<tr>
<td>
click
</td>
<td>
//input[@name='field_timezone_style']
</td>
<td></td>
</tr>
<tr>
<td>
click
</td>
<td>
//input[@value='Save Changes']
</td>
<td></td>
</tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
//div[@class='system-msg']
</td>
<td></td>
</tr>
</tbody></table>
</body>
</html>
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment