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/28 08:16:49 UTC
svn commit: r1621059 -
/ofbiz/branches/release11.04/framework/widget/templates/htmlFormMacroLibrary.ftl
Author: jleroux
Date: Thu Aug 28 06:16:49 2014
New Revision: 1621059
URL: http://svn.apache.org/r1621059
Log:
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 r1616281
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=1621059&r1=1621058&r2=1621059&view=diff
==============================================================================
--- ofbiz/branches/release11.04/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/branches/release11.04/framework/widget/templates/htmlFormMacroLibrary.ftl Thu Aug 28 06:16:49 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,