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

invites: Display name of referrer instead of email in invites list. 

We now display the name of referrer instead of email in invites list
and clicking on the name opens the user popover.
This helps us to avoid showing fake emails when the email address
visibility is hidden.

Tweaked by tabbott to still look at both email and name for filtering.
This commit is contained in:
sahil839 2020-07-04 01:33:39 +05:30 committed by Tim Abbott
parent 231af0f84d
commit 2381e25438
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
static/js/settings_invites.js
View File

@ -53,19 +53,22 @@ function populate_invites(invites_data) {
item.disable_buttons = item.disable_buttons =
item.invited_as === settings_config.user_role_values.owner.code && item.invited_as === settings_config.user_role_values.owner.code &&
!page_params.is_owner; !page_params.is_owner;
item.referrer_email = people.get_by_user_id(item.invited_by_user_id).email; item.referrer_name = people.get_by_user_id(item.invited_by_user_id).full_name;
return render_admin_invites_list({invite: item}); return render_admin_invites_list({invite: item});
}, },
filter: { filter: {
element: invites_table.closest(".settings-section").find(".search"), element: invites_table.closest(".settings-section").find(".search"),
predicate(item, value) { predicate(item, value) {
const referrer_email = people.get_by_user_id(item.invited_by_user_id).email; const referrer = people.get_by_user_id(item.invited_by_user_id);
const referrer_email = referrer.email;
const referrer_name = referrer.full_name;
const referrer_name_matched = referrer_name.toLowerCase().includes(value);
const referrer_email_matched = referrer_email.toLowerCase().includes(value); const referrer_email_matched = referrer_email.toLowerCase().includes(value);
if (item.is_multiuse) { if (item.is_multiuse) {
return referrer_email_matched; return referrer_name_matched || referrer_email_matched;
} }
const invitee_email_matched = item.email.toLowerCase().includes(value); const invitee_email_matched = item.email.toLowerCase().includes(value);
return referrer_email_matched || invitee_email_matched; return referrer_email_matched || referrer_name_matched || invitee_email_matched;
}, },
}, },
parent_container: $("#admin-invites-list").expectOne(), parent_container: $("#admin-invites-list").expectOne(),

4
static/templates/admin_invites_list.hbs
View File

@ -13,7 +13,9 @@
</td> </td>
{{#if is_admin}} {{#if is_admin}}
<td> <td>
<span class="referred_by">{{referrer_email}}</span> <span class="referred_by">
<a data-user-id="{{invited_by_user_id}}" href="#" class="view_user_profile">{{referrer_name}}</a>
</span>
</td> </td>
{{/if}} {{/if}}
<td> <td>