Skip to content
This repository was archived by the owner on May 9, 2020. It is now read-only.

Commit bc5a1bf

Browse files
committed
With OFBIZ-5702 - "Wrong timeFormat of datetimepicker causes hours represented as 12 not 24", I wrongly committed changes in R12 and R11 branches.
Though I thought I checked the jquery-ui-timepicker-addon version in R12 and R11, I obviously did it wrong. The jquery-ui-timepicker-addon version are there older (0.9.7 and 0.9.6 respectively) and don't contain the 24 hours format handling. So the changes in R12.04 r1616276 and R11.04 r1616281 were wrong. This reverts r1616276 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1621058 13f79535-47bb-0310-9956-ffa450edef68
1 parent 08af5e4 commit bc5a1bf

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

framework/widget/templates/htmlFormMacroLibrary.ftl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ under the License.
171171
jQuery("#${id}").datetimepicker({
172172
showSecond: true,
173173
<#-- showMillisec: true, -->
174-
timeFormat: 'HH:mm:ss',
174+
timeFormat: 'hh:mm:ss',
175175
stepHour: 1,
176176
stepMinute: 1,
177177
stepSecond: 1,
@@ -471,7 +471,7 @@ ${item.description}</span>
471471
jQuery("#${name?html}_fld0_value").datetimepicker({
472472
showSecond: true,
473473
<#-- showMillisec: true, -->
474-
timeFormat: 'HH:mm:ss',
474+
timeFormat: 'hh:mm:ss',
475475
stepHour: 1,
476476
stepMinute: 5,
477477
stepSecond: 10,
@@ -507,7 +507,7 @@ ${item.description}</span>
507507
jQuery("#${name?html}_fld1_value").datetimepicker({
508508
showSecond: true,
509509
<#-- showMillisec: true, -->
510-
timeFormat: 'HH:mm:ss',
510+
timeFormat: 'hh:mm:ss',
511511
stepHour: 1,
512512
stepMinute: 5,
513513
stepSecond: 10,

0 commit comments

Comments
 (0)