From: Marcin Haba <marcin.haba@bacula.pl>
Date: Thu, 10 Sep 2020 09:06:26 +0000 (+0200)
Subject: baculum: Fix #2562 displaying date and time in tables on Safari
X-Git-Tag: Release-9.6.6~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc4b62db3d7c0b554a09f2dfec5d2eefacdbe6cf;p=thirdparty%2Fbacula.git

baculum: Fix #2562 displaying date and time in tables on Safari
---

diff --git a/gui/baculum/protected/Common/Class/BClientScript.php b/gui/baculum/protected/Common/Class/BClientScript.php
index fb66d3911..0abd06e61 100644
--- a/gui/baculum/protected/Common/Class/BClientScript.php
+++ b/gui/baculum/protected/Common/Class/BClientScript.php
@@ -31,7 +31,7 @@ Prado::using('System.Web.UI.WebControls.TClientScript');
  */
 class BClientScript extends TClientScript {
 
-	const SCRIPTS_VERSION = 9;
+	const SCRIPTS_VERSION = 10;
 
 	public function getScriptUrl()
 	{
diff --git a/gui/baculum/protected/Web/JavaScript/misc.js b/gui/baculum/protected/Web/JavaScript/misc.js
index f43666662..e396988f4 100644
--- a/gui/baculum/protected/Web/JavaScript/misc.js
+++ b/gui/baculum/protected/Web/JavaScript/misc.js
@@ -286,7 +286,10 @@ var Formatters = {
 function render_date(data, type, row) {
 	var t = data;
 	if (t) {
-		var d = (new Date(t)).getTime();
+		var dati = t.split(' ');
+		var da = dati[0].split('-');
+		var ti = dati[1].split(':');
+		var d = (new Date(da[0], (da[1] - 1), da[2], ti[0], ti[1], ti[2], 0)).getTime();
 		if (type == 'display') {
 			t = Units.format_date(d);
 		} else {