Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-27 19:19:21 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

ContactProperty and FilterCondition use reviveFromJson

Browse source
This commit is contained in:
djmaze 2020-10-20 10:27:00 +02:00
parent 9844c1882c
commit 2470f1add6
9 changed files with 78 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

44
dev/View/Popup/Contacts.js
View file

@ -489,10 +489,7 @@ class ContactsPopupView extends AbstractViewNext {
* @param {?ContactModel} contact
*/
populateViewContact(contact) {
let id = '',
lastName = '',
firstName = '';
const list = [];
let id = '';
this.watchHash(false);
@ -501,49 +498,18 @@ class ContactsPopupView extends AbstractViewNext {
if (contact) {
id = contact.id;
if (Array.isNotEmpty(contact.properties)) {
contact.properties.forEach(property => {
if (property && property[0]) {
if (ContactPropertyType.LastName === property[0]) {
lastName = property[1];
} else if (ContactPropertyType.FirstName === property[0]) {
firstName = property[1];
} else {
list.push(new ContactPropertyModel(property[0], property[2] || '', property[1]));
}
}
});
}
this.viewReadOnly(!!contact.readOnly);
} else {
contact = new ContactModel;
contact.initDefaultProperties();
}
list.unshift(
new ContactPropertyModel(
ContactPropertyType.LastName,
'',
lastName,
false,
this.getPropertyPlaceholder(ContactPropertyType.LastName)
)
);
list.unshift(
new ContactPropertyModel(
ContactPropertyType.FirstName,
'',
firstName,
!contact,
this.getPropertyPlaceholder(ContactPropertyType.FirstName)
)
);
this.viewID(id);
delegateRunOnDestroy(this.viewProperties());
this.viewProperties([]);
this.viewProperties(list);
this.viewProperties(contact.properties);
this.watchDirty(false);
this.watchHash(true);