Uniform formatting for <f:displayWidget

Author: codeconsole

grails-fields/grails-app/taglib/grails/plugin/formfields/FormFieldsTagLib.groovy

@@ -20,8 +20,11 @@ package grails.plugin.formfields
 
 import java.sql.Blob
 import java.text.NumberFormat
+import java.time.Instant
 import java.time.LocalDate
 import java.time.LocalDateTime
+import java.time.OffsetDateTime
+import java.time.ZonedDateTime
 
 import groovy.transform.CompileStatic
 import groovy.util.logging.Slf4j
@@ -725,7 +728,7 @@ class FormFieldsTagLib {
         }
 
         // TODO: https://github.com/apache/grails-core/issues/14198
-        boolean datePicker = model.type in [Date, Calendar, java.sql.Date, java.sql.Time, LocalDate, LocalDateTime]
+        boolean datePicker = model.type in [Date, Calendar, java.sql.Date, java.sql.Time, LocalDate, LocalDateTime, Instant, ZonedDateTime, OffsetDateTime]
         if (!datePicker) {
             attrs.remove('selectDateClass')
         }
@@ -953,6 +956,9 @@ class FormFieldsTagLib {
             case java.sql.Time:
             case LocalDate:
             case LocalDateTime:
+            case Instant:
+            case ZonedDateTime:
+            case OffsetDateTime:
                 g.formatDate(date: model.value)
                 break
             default:

grails-fields/src/test/groovy/grails/plugin/formfields/DisplayWidgetSpec.groovy

@@ -18,6 +18,7 @@
  */
 package grails.plugin.formfields
 
+import grails.plugin.formfields.mock.Cyborg
 import grails.plugin.formfields.mock.Person
 import grails.plugin.formfields.taglib.AbstractFormFieldsTagLibSpec
 import grails.testing.web.taglib.TagLibUnitTest
@@ -27,7 +28,7 @@ class DisplayWidgetSpec extends AbstractFormFieldsTagLibSpec implements TagLibUn
 	def mockFormFieldsTemplateService = Mock(FormFieldsTemplateService)
 
 	def setupSpec() {
-		mockDomain(Person)
+		mockDomains(Person, Cyborg)
 	}
 
 	def setup() {
@@ -40,6 +41,11 @@ class DisplayWidgetSpec extends AbstractFormFieldsTagLibSpec implements TagLibUn
 		applyTemplate('<f:displayWidget bean="personInstance" property="dateOfBirth"/>', [personInstance: personInstance]) == applyTemplate('<g:formatDate date="${personInstance.dateOfBirth}"/>', [personInstance: personInstance])
 	}
 
+	void 'f:displayWidget without template and an instant value renders the formatted date'() {
+		expect:
+		applyTemplate('<f:displayWidget bean="cyborgInstance" property="timestamp"/>', [cyborgInstance: cyborgInstance]) == applyTemplate('<g:formatDate date="${cyborgInstance.timestamp}"/>', [cyborgInstance: cyborgInstance])
+	}
+
 	void 'f:displayWidget without template and a boolean value renders the formatted boolean'() {
 		expect:
 		applyTemplate('<f:displayWidget bean="personInstance" property="minor"/>', [personInstance: personInstance]) == applyTemplate('<g:formatBoolean boolean="${personInstance.minor}"/>', [personInstance: personInstance])

grails-fields/src/test/groovy/grails/plugin/formfields/mock/Person.groovy

@@ -18,13 +18,16 @@
  */
 package grails.plugin.formfields.mock
 
+import java.time.Instant
+
 import grails.gorm.annotation.AutoTimestamp
 import grails.persistence.Entity
 
 @Entity
 class Cyborg extends Person {
 	@AutoTimestamp(AutoTimestamp.EventType.CREATED) Date created
 	@AutoTimestamp Date modified
+	Instant timestamp
 }
 
 @Entity

grails-fields/src/test/groovy/grails/plugin/formfields/taglib/AbstractFormFieldsTagLibSpec.groovy

@@ -19,6 +19,8 @@
 
 package grails.plugin.formfields.taglib
 
+import java.time.Instant
+
 import grails.core.support.proxy.DefaultProxyHandler
 import grails.plugin.formfields.BeanPropertyAccessorFactory
 import grails.plugin.formfields.FieldsGrailsPlugin
@@ -45,7 +47,7 @@ abstract class AbstractFormFieldsTagLibSpec extends Specification implements Gra
 		personInstance.address = new Address(street: "94 Evergreen Terrace", city: "Springfield", country: "USA")
 		personInstance.emails = [home: "[email protected]", school: "[email protected]"]
         productInstance = new Product(netPrice: 12.33, name: "<script>alert('XSS');</script>")
-		cyborgInstance = new Cyborg(name: "Hal", password: "monolith", gender: null)
+		cyborgInstance = new Cyborg(name: "Hal", password: "monolith", gender: null, timestamp: Instant.parse("2025-10-16T00:12:15.195Z"))
 	}
 
 	def cleanup() {