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

(js) Save addressbook search string 

This allow to show the email address that matches the search string (if
it does)
pull/91/head
Francis Lachapelle 2015-05-01 09:41:17 -04:00
parent d9184d2363
commit 494e2be680
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -160,6 +160,7 @@
// Add 'isOwned' and 'isSubscription' attributes based on active user (TODO: add it server-side?)
this.isOwned = AddressBook.activeUser.isSuperUser || this.owner == AddressBook.activeUser.login;
this.isSubscription = !this.isRemote && this.owner != AddressBook.activeUser.login;
this.$query = undefined;
};
/**
@ -197,6 +198,7 @@
var futureAddressBookData = AddressBook.$$resource.fetch(addressbookId, 'view', params);
return futureAddressBookData.then(function(data) {
var cards;
_this.$query = search;
if (options && options.dry) {
// Don't keep a copy of the resulting cards.
// This is usefull when doing autocompletion.

2
UI/WebServerResources/js/Contacts/card-model.js
View File

@ -235,7 +235,7 @@
Card.prototype.$preferredEmail = function(partial) {
var email, re;
if (partial) {
re = new RegExp(partial);
re = new RegExp(partial, 'i');
email = _.find(this.emails, function(o) {
return re.test(o.value);
});