Merge pull request #8644 from abpframework/auto-merge/rel-4-3/308

Merge branch dev with rel-4.3
pull/8655/head
maliming 5 years ago committed by GitHub
commit 27980f3c87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -462,11 +462,19 @@ var abp = abp || {};
};
datatables.defaultRenderers['date'] = function (value) {
return (ISOStringToDateTimeLocaleString())(value);
if(!value) {
return value;
} else {
return (ISOStringToDateTimeLocaleString())(value);
}
};
datatables.defaultRenderers['datetime'] = function (value) {
return (ISOStringToDateTimeLocaleString(luxon.DateTime.DATETIME_SHORT))(value);
if(!value) {
return value;
} else {
return (ISOStringToDateTimeLocaleString(luxon.DateTime.DATETIME_SHORT))(value);
}
};
/************************************************************************

Loading…
Cancel
Save