From 239fe9421d8bc45286b495b045cbbb2f814bcb7b Mon Sep 17 00:00:00 2001 From: faissaloux Date: Sat, 6 Jan 2024 16:57:19 +0100 Subject: [PATCH 1/3] fix datetimefield wrap Signed-off-by: faissaloux --- libraries/classes/Display/Results.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php index caf82be001..0586e220d9 100644 --- a/libraries/classes/Display/Results.php +++ b/libraries/classes/Display/Results.php @@ -3121,7 +3121,7 @@ class Results $fieldTypeClass = ''; if ($meta->isMappedTypeTimestamp || $meta->isType(FieldMetadata::TYPE_DATETIME)) { - $fieldTypeClass = 'datetimefield'; + $fieldTypeClass = 'datetimefield text-nowrap'; } elseif ($meta->isType(FieldMetadata::TYPE_DATE)) { $fieldTypeClass = 'datefield'; } elseif ($meta->isType(FieldMetadata::TYPE_TIME)) { From cfb05d22b9512abd4b3c5075bc85c2641f375616 Mon Sep 17 00:00:00 2001 From: faissaloux Date: Sat, 6 Jan 2024 17:33:16 +0100 Subject: [PATCH 2/3] revert last commit Signed-off-by: faissaloux --- libraries/classes/Display/Results.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php index 0586e220d9..caf82be001 100644 --- a/libraries/classes/Display/Results.php +++ b/libraries/classes/Display/Results.php @@ -3121,7 +3121,7 @@ class Results $fieldTypeClass = ''; if ($meta->isMappedTypeTimestamp || $meta->isType(FieldMetadata::TYPE_DATETIME)) { - $fieldTypeClass = 'datetimefield text-nowrap'; + $fieldTypeClass = 'datetimefield'; } elseif ($meta->isType(FieldMetadata::TYPE_DATE)) { $fieldTypeClass = 'datefield'; } elseif ($meta->isType(FieldMetadata::TYPE_TIME)) { From 1012927d82119a52f3b86b12a54894c8cab18848 Mon Sep 17 00:00:00 2001 From: faissaloux Date: Sat, 6 Jan 2024 17:35:11 +0100 Subject: [PATCH 3/3] add timestamp to datetime types Signed-off-by: faissaloux --- libraries/classes/FieldMetadata.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/classes/FieldMetadata.php b/libraries/classes/FieldMetadata.php index d7fe1fedea..89aa507dbb 100644 --- a/libraries/classes/FieldMetadata.php +++ b/libraries/classes/FieldMetadata.php @@ -380,7 +380,8 @@ final class FieldMetadata { return $this->isType(self::TYPE_DATE) || $this->isType(self::TYPE_TIME) - || $this->isType(self::TYPE_DATETIME); + || $this->isType(self::TYPE_DATETIME) + || $this->isType(self::TYPE_TIMESTAMP); } /**