paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 06:23:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

settings_users: Do not allow sorting by email if emails are hidden.

Browse Source
This commit is contained in:
Sahil Batra
2022-03-09 12:26:47 +05:30
committed by Tim Abbott
parent 05af6fd8b4
commit cb15e0265d
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
static/js/admin.js
View File

@@ -160,6 +160,7 @@ export function build_page() {
create_web_public_stream_policy_values: create_web_public_stream_policy_values:
settings_config.create_web_public_stream_policy_values, settings_config.create_web_public_stream_policy_values,
disable_enable_spectator_access_setting: !page_params.server_web_public_streams_enabled, disable_enable_spectator_access_setting: !page_params.server_web_public_streams_enabled,
can_sort_by_email: settings_data.show_email(),
}; };
if (options.realm_logo_source !== "D" && options.realm_night_logo_source === "D") { if (options.realm_logo_source !== "D" && options.realm_night_logo_source === "D") {

2
static/templates/settings/deactivated_users_admin.hbs
View File

@@ -13,7 +13,7 @@
<table class="table table-condensed table-striped wrapped-table"> <table class="table table-condensed table-striped wrapped-table">
<thead class="table-sticky-headers"> <thead class="table-sticky-headers">
<th class="active" data-sort="alphabetic" data-sort-prop="full_name">{{t "Name" }}</th> <th class="active" data-sort="alphabetic" data-sort-prop="full_name">{{t "Name" }}</th>
<th data-sort="email">{{t "Email" }}</th> <th {{#if can_sort_by_email}}data-sort="email"{{/if}}>{{t "Email" }}</th>
<th class="user_id" data-sort="id">{{t "User ID" }}</th> <th class="user_id" data-sort="id">{{t "User ID" }}</th>
<th class="user_role" data-sort="role">{{t "Role" }}</th> <th class="user_role" data-sort="role">{{t "Role" }}</th>
{{#if is_admin}} {{#if is_admin}}

2
static/templates/settings/user_list_admin.hbs
View File

@@ -12,7 +12,7 @@
<table class="table table-condensed table-striped wrapped-table"> <table class="table table-condensed table-striped wrapped-table">
<thead class="table-sticky-headers"> <thead class="table-sticky-headers">
<th class="active" data-sort="alphabetic" data-sort-prop="full_name">{{t "Name" }}</th> <th class="active" data-sort="alphabetic" data-sort-prop="full_name">{{t "Name" }}</th>
<th data-sort="email">{{t "Email" }}</th> <th {{#if can_sort_by_email}}data-sort="email"{{/if}}>{{t "Email" }}</th>
<th class="user_id" data-sort="id">{{t "User ID" }}</th> <th class="user_id" data-sort="id">{{t "User ID" }}</th>
<th class="user_role" data-sort="role">{{t "Role" }}</th> <th class="user_role" data-sort="role">{{t "Role" }}</th>
<th class="last_active" data-sort="last_active">{{t "Last active" }}</th> <th class="last_active" data-sort="last_active">{{t "Last active" }}</th>