paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-16 03:41:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

users: Use role value directly to display user role text in frontend.

Browse Source 
Since, we now get role value in person objects sent from server, we
can simply user user_role_map to display role in different places
instead of having multiple if-else conditions to check flags like
is_admin, is_guest, etc.
This commit is contained in:
sahil839
2021-04-29 19:19:01 +05:30
committed by Tim Abbott
parent 4f354e28eb
commit 77499589f9
7 changed files with 14 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
static/js/people.js
View File

@@ -9,6 +9,7 @@ import {FoldDict} from "./fold_dict";
import {$t} from "./i18n";
import * as message_user_ids from "./message_user_ids";
import * as reload_state from "./reload_state";
import * as settings_config from "./settings_config";
import * as settings_data from "./settings_data";
import * as util from "./util";
@@ -268,17 +269,11 @@ export function get_user_time(user_id) {
export function get_user_type(user_id) {
const user_profile = get_by_user_id(user_id);
if (user_profile.is_owner) {
return $t({defaultMessage: "Owner"});
} else if (user_profile.is_admin) {
return $t({defaultMessage: "Administrator"});
} else if (user_profile.is_guest) {
return $t({defaultMessage: "Guest"});
} else if (user_profile.is_bot) {
if (user_profile.is_bot) {
return $t({defaultMessage: "Bot"});
}
return $t({defaultMessage: "Member"});
return settings_config.user_role_map.get(user_profile.role);
}
export function emails_strings_to_user_ids_string(emails_string) {

1
static/js/settings.js
View File

@@ -110,6 +110,7 @@ export function build_page() {
display_settings: settings_config.get_all_display_settings(),
user_can_change_name: settings_data.user_can_change_name(),
user_can_change_avatar: settings_data.user_can_change_avatar(),
user_role_text: people.get_user_type(page_params.user_id),
});
$(".settings-box").html(rendered_settings_tab);

4
static/js/settings_users.js
View File

@@ -239,9 +239,7 @@ function human_info(person) {
const info = {};
info.is_bot = false;
info.is_admin = person.is_admin;
info.is_guest = person.is_guest;
info.is_owner = person.is_owner;
info.user_role_text = people.get_user_type(person.user_id);
info.is_active = people.is_person_active(person.user_id);
info.user_id = person.user_id;
info.full_name = person.full_name;