svn commit: r1621058 - in /ofbiz/branches/release12.04: ./ 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: r1621058 - in /ofbiz/branches/release12.04: ./ framework/widget/templates/htmlFormMacroLibrary.ftl

jleroux@apache.org
Author: jleroux
Date: Thu Aug 28 06:16:42 2014
New Revision: 1621058

URL: http://svn.apache.org/r1621058
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 r1616276

Modified:
    ofbiz/branches/release12.04/   (props changed)
    ofbiz/branches/release12.04/framework/widget/templates/htmlFormMacroLibrary.ftl

Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
  Reverse-merged /ofbiz/trunk:r1616272

Modified: ofbiz/branches/release12.04/framework/widget/templates/htmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=1621058&r1=1621057&r2=1621058&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/branches/release12.04/framework/widget/templates/htmlFormMacroLibrary.ftl Thu Aug 28 06:16:42 2014
@@ -171,7 +171,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,
@@ -471,7 +471,7 @@ ${item.description}</span>
              jQuery("#${name?html}_fld0_value").datetimepicker({
                 showSecond: true,
                 <#-- showMillisec: true, -->
-                timeFormat: 'HH:mm:ss',
+                timeFormat: 'hh:mm:ss',
                 stepHour: 1,
                 stepMinute: 5,
                 stepSecond: 10,
@@ -507,7 +507,7 @@ ${item.description}</span>
              jQuery("#${name?html}_fld1_value").datetimepicker({
                 showSecond: true,
                 <#-- showMillisec: true, -->
-                timeFormat: 'HH:mm:ss',
+                timeFormat: 'hh:mm:ss',
                 stepHour: 1,
                 stepMinute: 5,
                 stepSecond: 10,