Merge pull request #791 from nextcloud/deathdate

Deathdate force
nextcloud · Dec 24, 2018 · 418da92 · 418da92
2 parents 620e829 + 25c38fc
commit 418da92
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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())
 		}