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

(js) Improve check on undefined email of card

pull/218/head
Francis Lachapelle 2016-07-20 11:02:50 -04:00
parent 596f991460
commit e742916084
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
UI/WebServerResources/js/Contacts/Card.service.js
View File

@ -246,7 +246,7 @@
};
Card.prototype.$fullname = function(options) {
var fn = this.c_cn || '', html = options && options.html, names;
var fn = this.c_cn || '', html = options && options.html, email, names;
if (fn.length === 0) {
names = [];
if (this.c_givenname && this.c_givenname.length > 0)
@ -261,10 +261,9 @@
fn = this.c_org;
}
else if (this.emails && this.emails.length > 0) {
fn = _.find(this.emails, function(i) { return i.value !== ''; }).value;
}
else if (this.c_cn && this.c_cn.length > 0) {
fn = this.c_cn;
email = _.find(this.emails, function(i) { return i.value !== ''; });
if (email)
fn = email.value;
}
}