amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-08-29 02:07:36 +00:00
Code Issues Projects Releases Wiki Activity

(js) Support SOGoLDAPContactInfoAttrbute

Browse Source
This commit is contained in:
Francis Lachapelle
2017-04-24 16:15:39 -04:00
parent 3d0c958a19
commit 634cbe3d1b
7 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/Templates/AdministrationUI/UIxAdministrationAclEditor.wox
+1 -1
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>
UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox
+1 -1
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>
UI/Templates/MailerUI/UIxMailUserDelegationEditor.wox
+1 -1
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>
UI/Templates/UIxAclEditor.wox
+2 -2
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>
UI/WebServerResources/js/Common/User.service.js
+6 -1
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;
};
/**
UI/WebServerResources/js/Contacts/Card.service.js
+2
View File
@@ -311,6 +311,8 @@
fn = email.value;
}
}
if (this.contactinfo)
fn += ' (' + this.contactinfo.split("\n").join("; ") + ')';
return fn;
};