svn commit: r1616272 - /ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1616272 - /ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl

jleroux@apache.org
Author: jleroux
Date: Wed Aug  6 16:39:30 2014
New Revision: 1616272

URL: http://svn.apache.org/r1616272
Log:
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/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl

Modified: ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=1616272&r1=1616271&r2=1616272&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl Wed Aug  6 16:39:30 2014
@@ -176,7 +176,7 @@ under the License.
         jQuery("#${id}").datetimepicker({
           showSecond: true,
           <#-- showMillisec: true, -->
-          timeFormat: 'hh:mm:ss',
+          timeFormat: 'HH:mm:ss',
           stepHour: 1,
           stepMinute: 1,
           stepSecond: 1,
@@ -490,7 +490,7 @@ under the License.
           jQuery("#${name?html}_fld0_value").datetimepicker({
             showSecond: true,
             <#-- showMillisec: true, -->
-            timeFormat: 'hh:mm:ss',
+            timeFormat: 'HH:mm:ss',
             stepHour: 1,
             stepMinute: 5,
             stepSecond: 10,
@@ -526,7 +526,7 @@ under the License.
           jQuery("#${name?html}_fld1_value").datetimepicker({
             showSecond: true,
             <#-- showMillisec: true, -->
-            timeFormat: 'hh:mm:ss',
+            timeFormat: 'HH:mm:ss',
             stepHour: 1,
             stepMinute: 5,
             stepSecond: 10,