You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2014/08/06 18:54:46 UTC
svn commit: r1616281 -
/ofbiz/branches/release11.04/framework/widget/templates/htmlFormMacroLibrary.ftl
Author: jleroux
Date: Wed Aug 6 16:54:46 2014
New Revision: 1616281
URL: http://svn.apache.org/r1616281
Log:
"Applied fix from trunk for revision: 1616272" (conflicts handled by hand)
------------------------------------------------------------------------
r1616272 | jleroux | 2014-08-06 18:39:30 +0200 (mer. 06 août 2014) | 3 lignes
A patch from Leon for "Wrong timeFormat of datetimepicker causes hours represented as 12 not 24" https://issues.apache.org/jira/browse/OFBIZ-5702
Latest datetimepicker add-on uses "timeFormat" option to detect am/pm, lowercase "h" represents 12hr am/pm, uppercase "H" represents 24 hr. (see https://github.com/trentrichardson/jQuery-Timepicker-Addon/issues/547). The datetime input widget that relying on this add-on does not work correctly: it's in 12-hours format not 24 hours.
------------------------------------------------------------------------
Modified:
ofbiz/branches/release11.04/framework/widget/templates/htmlFormMacroLibrary.ftl
Modified: ofbiz/branches/release11.04/framework/widget/templates/htmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=1616281&r1=1616280&r2=1616281&view=diff
==============================================================================
--- ofbiz/branches/release11.04/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/branches/release11.04/framework/widget/templates/htmlFormMacroLibrary.ftl Wed Aug 6 16:54:46 2014
@@ -167,7 +167,7 @@ under the License.
<#else>
jQuery("#${id}").datetimepicker({
showSecond: true,
- timeFormat: 'hh:mm:ss',
+ timeFormat: 'HH:mm:ss',
stepHour: 1,
stepMinute: 1,
stepSecond: 1,
@@ -460,7 +460,7 @@ ${item.description}</span>
<#else>
jQuery("#${name?html}_fld0_value").datetimepicker({
showSecond: true,
- timeFormat: 'hh:mm:ss',
+ timeFormat: 'HH:mm:ss',
stepHour: 1,
stepMinute: 5,
stepSecond: 10,
@@ -495,7 +495,7 @@ ${item.description}</span>
<#else>
jQuery("#${name?html}_fld1_value").datetimepicker({
showSecond: true,
- timeFormat: 'hh:mm:ss',
+ timeFormat: 'HH:mm:ss',
stepHour: 1,
stepMinute: 5,
stepSecond: 10,