Merge pull request #1035 from nextcloud/fix/empty/values

Remove some properties if empty
nextcloud · Apr 2, 2019 · 0ce330c · 0ce330c
2 parents 08fab90 + 1466de5
commit 0ce330c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/components/ContactsList/ContactsListItem.vue b/src/components/ContactsList/ContactsListItem.vue
@@ -41,8 +41,8 @@
 			<div class="app-content-list-item-line-one">
 				{{ contact.displayName }}
 			</div>
-			<div class="icon-history" tabindex="0"
-				v-tooltip.auto="t('contacts', 'Deleting the contact in {countdown} seconds', { countdown })"
+			<div v-tooltip.auto="t('contacts', 'Deleting the contact in {countdown} seconds', { countdown })" class="icon-history"
+				tabindex="0"
 				@click.prevent.stop="cancelDeletion" @keypress.enter.prevent.stop="cancelDeletion" />
 		</div>
 	</transition>

diff --git a/src/models/contact.js b/src/models/contact.js
@@ -259,6 +259,12 @@ export default class Contact {
 	 * @memberof Contact
 	 */
 	set groups(groups) {
+		// delete the title if empty
+		if (isEmpty(groups)) {
+			this.vCard.removeProperty('categories')
+			return true
+		}
+
 		if (Array.isArray(groups)) {
 			let property = this.vCard.getFirstProperty('categories')
 			if (!property) {
@@ -308,6 +314,10 @@ export default class Contact {
 	 * @memberof Contact
 	 */
 	set org(org) {
+		// delete the org if empty
+		if (isEmpty(org)) {
+			return this.vCard.removeProperty('org')
+		}
 		return this.vCard.updatePropertyWithValue('org', org)
 	}
 
@@ -328,6 +338,10 @@ export default class Contact {
 	 * @memberof Contact
 	 */
 	set title(title) {
+		// delete the title if empty
+		if (isEmpty(title)) {
+			return this.vCard.removeProperty('title')
+		}
 		return this.vCard.updatePropertyWithValue('title', title)
 	}