diff --git a/NEWS b/NEWS index 0ad9ca742..40a1b7277 100644 --- a/NEWS +++ b/NEWS @@ -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) diff --git a/UI/Templates/AdministrationUI/UIxAdministrationAclEditor.wox b/UI/Templates/AdministrationUI/UIxAdministrationAclEditor.wox index ec70d5f50..4f41b8a99 100644 --- a/UI/Templates/AdministrationUI/UIxAdministrationAclEditor.wox +++ b/UI/Templates/AdministrationUI/UIxAdministrationAclEditor.wox @@ -61,7 +61,7 @@ {{user.cn}} + md-highlight-flags="^i">{{ user.$fullname() }} {{user.c_email}} diff --git a/UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox b/UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox index 5fa331b04..6d634415c 100644 --- a/UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox +++ b/UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox @@ -93,7 +93,7 @@ {{user.cn}} {{user.$fullname()}} {{user.c_email}} diff --git a/UI/Templates/MailerUI/UIxMailUserDelegationEditor.wox b/UI/Templates/MailerUI/UIxMailUserDelegationEditor.wox index 63b734d3a..0d71b82c2 100644 --- a/UI/Templates/MailerUI/UIxMailUserDelegationEditor.wox +++ b/UI/Templates/MailerUI/UIxMailUserDelegationEditor.wox @@ -38,7 +38,7 @@ {{user.cn}} + md-highlight-flags="^i">{{user.$fullname()}} {{user.c_email}} diff --git a/UI/Templates/UIxAclEditor.wox b/UI/Templates/UIxAclEditor.wox index 6ce640349..de47aef04 100644 --- a/UI/Templates/UIxAclEditor.wox +++ b/UI/Templates/UIxAclEditor.wox @@ -38,10 +38,10 @@ {{user.cn}} + md-highlight-flags="^i">{{ user.$fullname() }} {{user.c_email}} + md-highlight-flags="^i">{{ user.c_email }} diff --git a/UI/WebServerResources/js/Common/User.service.js b/UI/WebServerResources/js/Common/User.service.js index 5d9d860da..570d90258 100644 --- a/UI/WebServerResources/js/Common/User.service.js +++ b/UI/WebServerResources/js/Common/User.service.js @@ -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; }; /** diff --git a/UI/WebServerResources/js/Contacts/Card.service.js b/UI/WebServerResources/js/Contacts/Card.service.js index c000a9acb..8f8753164 100644 --- a/UI/WebServerResources/js/Contacts/Card.service.js +++ b/UI/WebServerResources/js/Contacts/Card.service.js @@ -311,6 +311,8 @@ fn = email.value; } } + if (this.contactinfo) + fn += ' (' + this.contactinfo.split("\n").join("; ") + ')'; return fn; };