LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix position of new or renamed addressbook

pull/91/head
Francis Lachapelle 2014-12-18 16:30:59 -05:00
parent 4248cbcb16
commit bc86ff1e04
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
UI/WebServerResources/js/Contacts/addressbook-model.js
View File

@ -53,7 +53,7 @@
* @memberof AddressBook
* @desc Search for cards among all addressbooks matching some criterias.
* @param {string} search - the search string to match
* @param {hash} [options] - additional options to the query (excludeGroups and excludeLists)
* @param {object} [options] - additional options to the query (excludeGroups and excludeLists)
* @returns a collection of Cards instances
*/
AddressBook.$filterAll = function(search, options) {
@ -82,9 +82,11 @@
addressbook.isOwned = this.activeUser.isSuperUser || addressbook.owner == this.activeUser.login;
addressbook.isSubscription = addressbook.owner != this.activeUser.login;
sibling = _.find(this.$addressbooks, function(o) {
return (o.isRemote || (o.id != 'personal'
&& o.isSubscription === addressbook.isSubscription
&& o.name.localeCompare(addressbook.name) === 1));
return (o.isRemote
|| (!addressbook.isSubscription && o.isSubscription)
|| (o.id != 'personal'
&& o.isSubscription === addressbook.isSubscription
&& o.name.localeCompare(addressbook.name) === 1));
});
i = sibling ? _.indexOf(_.pluck(this.$addressbooks, 'id'), sibling.id) : 1;
this.$addressbooks.splice(i, 0, addressbook);
@ -161,7 +163,7 @@
* @memberof AddressBook.prototype
* @desc Search for cards matching some criterias
* @param {string} search - the search string to match
* @param {hash} [options] - additional options to the query
* @param {object} [options] - additional options to the query
* @returns a collection of Cards instances
*/
AddressBook.prototype.$filter = function(search, options) {