diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2018-12-24 07:50:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-24 07:50:30 +0100 |
| commit | 418da92051c632efd48e0caa23e77b5b93f24c4e (patch) | |
| tree | 9fd93997476abf51d3cde9231f6c669ac17039b1 | |
| parent | 620e8297bc86aa29b539ecde38dbfa35bacb8a83 (diff) | |
| parent | 25c38fcc89d68ba81384bc3e38368ea1b629e18f (diff) | |
Merge pull request #791 from nextcloud/deathdate
Deathdate force
| -rw-r--r-- | src/components/Properties/PropertyDateTime.vue | 4 | ||||
| -rw-r--r-- | src/models/rfcProps.js | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/components/Properties/PropertyDateTime.vue b/src/components/Properties/PropertyDateTime.vue index 8bbb66a5..5321e561 100644 --- a/src/components/Properties/PropertyDateTime.vue +++ b/src/components/Properties/PropertyDateTime.vue @@ -157,9 +157,9 @@ export default { data() { return { // input type following DatePicker docs - inputType: this.property.getDefaultType() === 'date-time' || this.property.getDefaultType() === 'date-and-or-time' + inputType: this.property.type === 'date-time' || this.property.type === 'date-and-or-time' ? 'datetime' - : this.property.getDefaultType() === 'date' + : this.property.type === 'date' ? 'date' : 'time', diff --git a/src/models/rfcProps.js b/src/models/rfcProps.js index 3a21b250..0258d9b1 100644 --- a/src/models/rfcProps.js +++ b/src/models/rfcProps.js @@ -105,6 +105,7 @@ const properties = { deathdate: { readableName: t('contacts', 'Date of death'), icon: 'icon-calendar-dark', + force: 'date', defaultValue: { value: new VCardTime().fromJSDate(new Date()) } |