(js) Support SOGoLDAPContactInfoAttrbute

pull/236/head
Francis Lachapelle 2017-04-24 16:15:39 -04:00
parent 3d0c958a19
commit 634cbe3d1b
7 changed files with 14 additions and 6 deletions

1
NEWS
View File

@ -13,6 +13,7 @@ Bug fixes
- [web] fixed attachment path when inside multiple body parts
- [web] fixed email reminder with attendees (#4115)
- [web] prevented form to be marked dirty when changing password (#4138)
- [web] restored support for SOGoLDAPContactInfoAttribute
- [core] cherry-picked comma escaping fix from v2 (#3296)
- [core] fix sogo-tool restore potentially crashing on corrupted data (#4048)
- [core] handle properly mails using windows-1255 charset (#4124)

View File

@ -61,7 +61,7 @@
<span class="md-contact-suggestion">
<span class="md-contact-name"
md-highlight-text="acl.searchText"
md-highlight-flags="^i">{{user.cn}}</span>
md-highlight-flags="^i">{{ user.$fullname() }}</span>
<span class="md-contact-email"
md-highlight-text="acl.searchText"
md-highlight-flags="^i">{{user.c_email}}</span>

View File

@ -93,7 +93,7 @@
<span class="md-contact-suggestion" layout="row" layout-align="space-between center">
<span class="md-contact-name"
md-highlight-text="searchText"
md-highlight-flags="^i">{{user.cn}}</span> <span class="md-contact-email"
md-highlight-flags="^i">{{user.$fullname()}}</span> <span class="md-contact-email"
md-highlight-text="searchText"
md-highlight-flags="^i">{{user.c_email}}</span>
</span>

View File

@ -38,7 +38,7 @@
<span class="md-contact-suggestion">
<span class="md-contact-name"
md-highlight-text="delegate.searchText"
md-highlight-flags="^i">{{user.cn}}</span>
md-highlight-flags="^i">{{user.$fullname()}}</span>
<span class="md-contact-email"
md-highlight-text="delegate.searchText"
md-highlight-flags="^i">{{user.c_email}}</span>

View File

@ -38,10 +38,10 @@
<span class="md-contact-suggestion">
<span class="md-contact-name"
md-highlight-text="acl.searchText"
md-highlight-flags="^i">{{user.cn}}</span>
md-highlight-flags="^i">{{ user.$fullname() }}</span>
<span class="md-contact-email"
md-highlight-text="acl.searchText"
md-highlight-flags="^i">{{user.c_email}}</span>
md-highlight-flags="^i">{{ user.c_email }}</span>
</span>
</md-item-template>
</md-autocomplete>

View File

@ -131,7 +131,12 @@
* @return a string representing the fullname
*/
User.prototype.$fullname = function() {
return this.cn || this.uid;
var fullname = this.cn || this.uid;
if (this.c_info)
fullname += ' (' + this.c_info.split("\n").join("; ") + ')';
return fullname;
};
/**

View File

@ -311,6 +311,8 @@
fn = email.value;
}
}
if (this.contactinfo)
fn += ' (' + this.contactinfo.split("\n").join("; ") + ')';
return fn;
};