Author: jleroux Date: Sat Nov 22 22:50:31 2014 New Revision: 1641132 URL: http://svn.apache.org/r1641132 Log: "Applied fix from trunk for revision: 1641131" ------------------------------------------------------------------------ r1641131 | jleroux | 2014-11-22 23:48:44 +0100 (sam. 22 nov. 2014) | 1 ligne
A patch from Gareth Carter for "jQuery datetimepicker popup time value is not set correctly from an existing value" https://issues.apache.org/jira/browse/OFBIZ-5883 ------------------------------------------------------------------------ Modified: ofbiz/branches/release13.07/ (props changed) ofbiz/branches/release13.07/framework/widget/templates/htmlFormMacroLibrary.ftl Propchange: ofbiz/branches/release13.07/ ------------------------------------------------------------------------------ Merged /ofbiz/trunk:r1641131 Modified: ofbiz/branches/release13.07/framework/widget/templates/htmlFormMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=1641132&r1=1641131&r2=1641132&view=diff ============================================================================== --- ofbiz/branches/release13.07/framework/widget/templates/htmlFormMacroLibrary.ftl (original) +++ ofbiz/branches/release13.07/framework/widget/templates/htmlFormMacroLibrary.ftl Sat Nov 22 22:50:31 2014 @@ -128,6 +128,7 @@ under the License. <#-- The JS date parser doesn't understand the dot before ms in the date/time string. The ms here should be always 0 --> if (initDate.indexOf('.') != -1) { initDate = initDate.substring(0, initDate.indexOf('.')); + jQuery("#${id}").val(initDate); } var ofbizTime = "<#if shortDateInput?exists && shortDateInput>yyyy-MM-dd<#else>yyyy-MM-dd HH:mm:ss</#if>"; var dateObj = Date.parseExact(initDate, ofbizTime);
