Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

popovers: Hide email under hidden email-address-visibility cases. 

When email address visibility is set to everyone, there is no change in
behavior, but when it is set to "admins-only", we don't show any email
in popovers for everyone but admins.
This commit is contained in:
Pragati Agrawal 2019-06-23 21:25:15 +05:30 committed by Tim Abbott
parent 857470c5ca
commit b1318edbea
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
static/js/popovers.js
View File

@ -146,6 +146,13 @@ function get_custom_profile_field_data(user, field, field_types, dateFormat) {
return profile_field;
}
function get_visible_email(user) {
if (user.delivery_email) {
return user.delivery_email;
}
return user.email;
}
function render_user_info_popover(user, popover_element, is_sender_popover, private_msg_class,
template_class, popover_placement) {
var is_me = people.is_my_user_id(user.user_id);
@ -174,7 +181,7 @@ function render_user_info_popover(user, popover_element, is_sender_popover, priv
sent_by_uri: hash_util.by_sender_uri(user.email),
show_email: settings_org.show_email(),
show_user_profile: !(user.is_bot || page_params.custom_profile_fields.length === 0),
user_email: user.email,
user_email: get_visible_email(user),
user_full_name: user.full_name,
user_id: user.user_id,
user_last_seen_time_status: buddy_data.user_last_seen_time_status(user.user_id),