Author: jleroux
Date: Fri Mar 16 15:39:18 2018
New Revision: 1826997
URL: http://svn.apache.org/viewvc?rev=1826997&view=rev
Log:
Fixed: The server hour normally shown in the jobs list is no longer showing
(OFBIZ-10278)
With FTL formatting in OFBIZ-7636, the commented single line got broken into 3
lines making it an invalid js code.
Thanks: Aditya
Modified:
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/ServerHour24HourFormatJs.ftl
Modified:
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/ServerHour24HourFormatJs.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/ServerHour24HourFormatJs.ftl?rev=1826997&r1=1826996&r2=1826997&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/ServerHour24HourFormatJs.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/ServerHour24HourFormatJs.ftl
Fri Mar 16 15:39:18 2018
@@ -37,9 +37,7 @@ under the License.
date.setSeconds(date.getSeconds() + 1);
}
// dateFormat does not respect the timezone :/ Fortunately
toString is what we want :)
- //jQuery("#${clockField}
- ").text("${uiLabelMap.CommonServerHour}
- : " + dateFormat(date, "yyyy-mm-dd HH:MM:ss"));
+ //jQuery("#${clockField}").text("${uiLabelMap.CommonServerHour}: "
+ dateFormat(date, "yyyy-mm-dd HH:MM:ss"));
jQuery("#${clockField}").text("${uiLabelMap.CommonServerHour}: " +
date.toString());
}
})
