diff --git a/apps/assets/templates/assets/_asset_user_list.html b/apps/assets/templates/assets/_asset_user_list.html
index f76754391..ca752e58d 100644
--- a/apps/assets/templates/assets/_asset_user_list.html
+++ b/apps/assets/templates/assets/_asset_user_list.html
@@ -51,8 +51,7 @@ function initAssetUserTable() {
} else {
innerHtml = ''
}
- var date = new Date(cellData.datetime);
- var dateManual = date.toLocaleString();
+ var dateManual = formatDateAsCN(cellData.datetime);
var dataContent = testDatetime + dateManual;
innerHtml = "" + innerHtml + "";
$(td).html(innerHtml);
diff --git a/apps/assets/templates/assets/asset_list.html b/apps/assets/templates/assets/asset_list.html
index a20d4f35f..4750a4f95 100644
--- a/apps/assets/templates/assets/asset_list.html
+++ b/apps/assets/templates/assets/asset_list.html
@@ -159,8 +159,7 @@ function initTable() {
} else {
innerHtml = ''
}
- var date = new Date(cellData.datetime);
- var dateManual = date.toLocaleString();
+ var dateManual = formatDateAsCN(cellData.datetime);
var dataContent = testDatetime + dateManual;
innerHtml = "" + innerHtml + "";
$(td).html(innerHtml);
diff --git a/apps/ops/templates/ops/adhoc_history.html b/apps/ops/templates/ops/adhoc_history.html
index cab76f692..ef83e1c4f 100644
--- a/apps/ops/templates/ops/adhoc_history.html
+++ b/apps/ops/templates/ops/adhoc_history.html
@@ -82,7 +82,7 @@ function initTable() {
select: [],
columnDefs: [
{targets: 1, createdCell: function (td, cellData, rowData) {
- var d = new Date(cellData);
+ var d = formatDateAsCN(cellData);
$(td).html(d);
}},
{targets: 2, createdCell: function (td, cellData) {
diff --git a/apps/ops/templates/ops/task_adhoc.html b/apps/ops/templates/ops/task_adhoc.html
index 95eb8f471..8dd29637f 100644
--- a/apps/ops/templates/ops/task_adhoc.html
+++ b/apps/ops/templates/ops/task_adhoc.html
@@ -109,8 +109,8 @@ $(document).ready(function () {
}
}},
{targets: 6, createdCell: function (td, cellData) {
- var d = new Date(cellData);
- $(td).html(d.toLocaleString())
+ var d = formatDateAsCN(cellData);
+ $(td).html(d)
}},
{targets: 7, createdCell: function (td, cellData, rowData) {
var detail_btn = '{% trans "Detail" %}'.replace('{{ DEFAULT_PK }}', cellData);
diff --git a/apps/ops/templates/ops/task_history.html b/apps/ops/templates/ops/task_history.html
index 9aa73c176..054b0bf5e 100644
--- a/apps/ops/templates/ops/task_history.html
+++ b/apps/ops/templates/ops/task_history.html
@@ -88,8 +88,9 @@ function initTable() {
select: [],
columnDefs: [
{targets: 1, createdCell: function (td, cellData, rowData) {
- var d = new Date(cellData);
- $(td).html(d.toLocaleString());
+ var d = formatDateAsCN(cellData);
+ $(td).html(d);
+
}},
{targets: 2, createdCell: function (td, cellData) {
var total = "" + cellData.total + "";
diff --git a/apps/terminal/templates/terminal/command_list.html b/apps/terminal/templates/terminal/command_list.html
index 88660a39d..047b72a4d 100644
--- a/apps/terminal/templates/terminal/command_list.html
+++ b/apps/terminal/templates/terminal/command_list.html
@@ -89,14 +89,16 @@ $(document).ready(function () {
language: navigator.language || "en",
};
dateFromRef.datepicker(options).on("changeDate", function () {
- var date = new Date($(this).val() + ' 0:0:0');
+ var value = $(this).val() + ' 0:0:0';
+ var date = safeDate(value);
var url = table.ajax.url();
url = setUrlParam(url, "date_from", date.getTime()/1000);
table.ajax.url(url);
table.ajax.reload();
});
dateToRef.datepicker(options).on("changeDate", function () {
- var date = new Date($(this).val() + ' 23:59:59');
+ var value = $(this).val() + ' 23:59:59';
+ var date = safeDate(value);
var url = table.ajax.url();
url = setUrlParam(url, "date_to", date.getTime()/1000);
table.ajax.url(url);
diff --git a/apps/terminal/templates/terminal/session_list.html b/apps/terminal/templates/terminal/session_list.html
index 648fc1ea7..7d7f4b5c5 100644
--- a/apps/terminal/templates/terminal/session_list.html
+++ b/apps/terminal/templates/terminal/session_list.html
@@ -104,8 +104,8 @@ var dateFrom = "{{ date_from.timestamp }}";
var dateTo = "{{ date_to.timestamp }}";
function initTable() {
- dateFrom = new Date(dateFrom * 1000).toISOString();
- dateTo = new Date(dateTo * 1000).toISOString();
+ dateFrom = formatDateAsCN(dateFrom * 1000);
+ dateTo = formatDateAsCN(dateTo * 1000);
sessionListUrl = setUrlParam(sessionListUrl, "date_from", dateFrom);
sessionListUrl = setUrlParam(sessionListUrl, "date_to", dateTo);
var options = {
@@ -201,9 +201,9 @@ $(document).ready(function() {
return
}
var value = $(this).val() + ' 0:0:0';
- var date = new Date(value);
+ var date = formatDateAsCN(value);
var url = table.ajax.url();
- url = setUrlParam(url, "date_from", date.toISOString());
+ url = setUrlParam(url, "date_from", date);
table.ajax.url(url);
table.ajax.reload();
});
@@ -212,9 +212,9 @@ $(document).ready(function() {
return
}
var value = $(this).val() + ' 23:59:59';
- var date = new Date(value);
+ var date = formatDateAsCN(value);
var url = table.ajax.url();
- url = setUrlParam(url, "date_to", date.toISOString());
+ url = setUrlParam(url, "date_to", date);
table.ajax.url(url);
table.ajax.reload();
});