Skip to content

Commit 0b1d127

Browse files
authored
Merge pull request #15165 from codeconsole/7.0.x-fieldsDateTimeRendering
default fields dates to datetime precision
2 parents ed30ff2 + 791217c commit 0b1d127

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -966,7 +966,7 @@ class FormFieldsTagLib {
966966
case Instant:
967967
case ZonedDateTime:
968968
case OffsetDateTime:
969-
g.formatDate(date: model.value)
969+
g.formatDate(date: model.value, type: 'DATETIME')
970970
break
971971
default:
972972
g.fieldValue(bean: model.bean, field: model.property)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ class DisplayWidgetSpec extends AbstractFormFieldsTagLibSpec implements TagLibUn
3838

3939
void 'f:displayWidget without template and a date value renders the formatted date'() {
4040
expect:
41-
applyTemplate('<f:displayWidget bean="personInstance" property="dateOfBirth"/>', [personInstance: personInstance]) == applyTemplate('<g:formatDate date="${personInstance.dateOfBirth}"/>', [personInstance: personInstance])
41+
applyTemplate('<f:displayWidget bean="personInstance" property="dateOfBirth"/>', [personInstance: personInstance]) == applyTemplate('<g:formatDate date="${personInstance.dateOfBirth}" type="DATETIME"/>', [personInstance: personInstance])
4242
}
4343

4444
void 'f:displayWidget without template and an instant value renders the formatted date'() {
4545
expect:
46-
applyTemplate('<f:displayWidget bean="cyborgInstance" property="timestamp"/>', [cyborgInstance: cyborgInstance]) == applyTemplate('<g:formatDate date="${cyborgInstance.timestamp}"/>', [cyborgInstance: cyborgInstance])
46+
applyTemplate('<f:displayWidget bean="cyborgInstance" property="timestamp"/>', [cyborgInstance: cyborgInstance]) == applyTemplate('<g:formatDate date="${cyborgInstance.timestamp}" type="DATETIME"/>', [cyborgInstance: cyborgInstance])
4747
}
4848

4949
void 'f:displayWidget without template and a LocalDate value renders the formatted date'() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ class DisplayTagSpec extends AbstractFormFieldsTagLibSpec implements TagLibUnitT
9898

9999
void 'renders date values using g:formatDate'() {
100100
expect:
101-
applyTemplate('<f:display bean="personInstance" property="dateOfBirth"/>', [personInstance: personInstance]) ==~ /1987-04-19 00:00:00 [A-Z]{3,4}/
101+
applyTemplate('<f:display bean="personInstance" property="dateOfBirth"/>', [personInstance: personInstance]) == applyTemplate('<g:formatDate date="${personInstance.dateOfBirth}" type="DATETIME"/>', [personInstance: personInstance])
102102
}
103103

104104
void 'displays using template if one is present'() {

0 commit comments

Comments
 (0)