amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-22 03:45:25 +00:00
Code Issues Projects Releases Wiki Activity

fix(calendar(js)): improve attendees editor when adding new attendees

Browse Source 
Fixes #5049
This commit is contained in:
Francis Lachapelle
2020-06-23 12:02:31 -04:00
parent 4d517e992f
commit 3d3b17adb8
3 changed files with 35 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/js/Scheduler/ComponentController.js
+21 -7
View File
@@ -283,8 +283,7 @@
// Autocomplete cards for attendees
this.cardFilter = function ($query) {
AddressBook.$filterAll($query);
return AddressBook.$cards;
return AddressBook.$filterAll($query);
};
this.addAttendee = function (card, partial) {
@@ -301,7 +300,21 @@
name = str.replace(new RegExp(" *<?" + email + ">? *"), '');
vm.showAttendeesEditor |= initOrganizer;
vm.searchText = '';
return new Card({ c_cn: _.trim(name, ' "'), emails: [{ value: email }] });
return vm.cardFilter(email).then(function (cards) {
if (cards.length) {
return cards[0];
} else {
return new Card({ c_cn: _.trim(name, ' "'), emails: [{ value: email }] });
}
}).catch(function (err) {
// Server error
return new Card({ c_cn: _.trim(name, ' "'), emails: [{ value: email }] });
});
}
function addCard(newCard) {
if (!vm.component.$attendees.hasAttendee(newCard))
vm.component.$attendees.add(newCard, options);
}
if (angular.isString(card)) {
@@ -317,18 +330,19 @@
card.charCodeAt(i) == 44 || // ,
card.charCodeAt(i) == 59) && // ;
emailRE.test(address)) {
this.component.$attendees.add(createCard(address), options);
createCard(address).then(addCard);
address = '';
}
else {
address += card.charAt(i);
}
}
if (address)
this.component.$attendees.add(createCard(address), options);
if (address && emailRE.test(address))
createCard(address).then(addCard);
}
else {
this.component.$attendees.add(card, options);
if (!this.component.$attendees.hasAttendee(card))
this.component.$attendees.add(card, options);
this.showAttendeesEditor |= initOrganizer;
}