svn commit: r1827002 - /ofbiz/branches/release16.11/framework/common/template/includes/ServerHour24HourFormatJs.ftl

Author: jleroux
Date: Fri Mar 16 15:46:57 2018
New Revision: 1827002

URL: http://svn.apache.org/viewvc?rev=1827002&view=rev
Log:
"Applied fix from trunk for revision: 1826997  "
------------------------------------------------------------------------
r1826997 | jleroux | 2018-03-16 16:39:18 +0100 (ven., 16 mars 2018) | 7 lines

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/branches/release16.11/framework/common/template/includes/ServerHour24HourFormatJs.ftl

Modified: ofbiz/branches/release16.11/framework/common/template/includes/ServerHour24HourFormatJs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/framework/common/template/includes/ServerHour24HourFormatJs.ftl?rev=1827002&r1=1827001&r2=1827002&view=diff
==============================================================================
--- ofbiz/branches/release16.11/framework/common/template/includes/ServerHour24HourFormatJs.ftl (original)
+++ ofbiz/branches/release16.11/framework/common/template/includes/ServerHour24HourFormatJs.ftl Fri Mar 16 15:46:57 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());
         }
     })