paweld/pas2js
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/pas2js.git synced 2025-08-28 18:10:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Better handling of empty dates

Browse Source
This commit is contained in:
Michaël Van Canneyt 2024-01-14 14:48:01 +01:00
parent f6aa05353b
commit 0cffa26111
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/bootstrap/src/bootstraptablewidget.pp
View File

@ -878,12 +878,10 @@ function TCustomDBBootstrapTableWidget.MakeDateTimeRenderCol(aCol: TBootstrapTab
DT : TDateTime;
begin
if aTableCol.Formatting = '' then
Result := String(Data)
else
begin
if IsNull(Data) then
if IsNull(Data) or isUndefined(Data) then
Result:=''
else if aTableCol.Formatting = '' then
Result := String(Data)
else
begin
if Data is TJSDate then
@ -897,7 +895,6 @@ function TCustomDBBootstrapTableWidget.MakeDateTimeRenderCol(aCol: TBootstrapTab
else
Result := FormatDateTime(aTableCol.Formatting, DT)
end;
end;
if aTableCol.ExtraAttributes <> '' then
Result := Format('<span %s>%s</span>', [ReplaceMoustache(row, aTableCol.ExtraAttributes), Result]);
end;