Merge pull request #8 from nextcloud/downstream-sabre-fn

Sabre dav 3.2 requires on each vcard to have fn set
nextcloud · Nov 15, 2016 · e068649 · e068649
2 parents a938314 + ed1659d
commit e068649
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/js/models/contact_model.js b/js/models/contact_model.js
@@ -225,9 +225,11 @@ angular.module('contactsApp')
 						self.setProperty(name, self.props[name][0]);
 					}
 				});
+				// force fn to be set
+				this.fullName(this.fullName());
 
 				// keep vCard in sync
-				this.data.addressData = $filter('JSON2vCard')(this.props);
+				self.data.addressData = $filter('JSON2vCard')(self.props);
 			},
 
 			matches: function(pattern) {

diff --git a/js/services/contact_service.js b/js/services/contact_service.js
@@ -93,6 +93,9 @@ angular.module('contactsApp')
 		newContact.uid(newUid);
 		newContact.setUrl(addressBook, newUid);
 		newContact.addressBookId = addressBook.displayName;
+		if (_.isUndefined(newContact.fullName()) || newContact.fullName() === '') {
+			newContact.fullName(t('contacts', 'New contact'));
+		}
 
 		return DavClient.createCard(
 			addressBook,