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

settings_users: Show previously selected value in role code dropdown.

Browse Source 
Fixes
https://chat.zulip.org/#narrow/stream/9-issues/topic/filters.20are.20not.20working.20properly/near/1923794.
This commit also changes the datatype used for the dropdown to number
which is more suitable for our case.
This commit is contained in:
Shubham Padia
2024-08-22 01:09:12 +00:00
committed by Tim Abbott
parent f38fe78e53
commit 548c583cf9
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
web/src/settings_users.js
View File

@@ -152,23 +152,24 @@ function role_selected_handler(event, dropdown, widget) {
function get_roles() { function get_roles() {
return [ return [
{unique_id: "0", name: $t({defaultMessage: "All roles"})}, {unique_id: 0, name: $t({defaultMessage: "All roles"})},
...Object.values(settings_config.user_role_values) ...Object.values(settings_config.user_role_values)
.map((user_role_value) => ({ .map((user_role_value) => ({
unique_id: user_role_value.code.toString(), unique_id: user_role_value.code,
name: user_role_value.description, name: user_role_value.description,
})) }))
.reverse(), .reverse(),
]; ];
} }
function create_role_filter_dropdown($events_container, widget_name) { function create_role_filter_dropdown($events_container, section) {
new dropdown_widget.DropdownWidget({ new dropdown_widget.DropdownWidget({
widget_name, widget_name: section.dropdown_widget_name,
unique_id_type: dropdown_widget.DataTypes.NUMBER,
get_options: get_roles, get_options: get_roles,
$events_container, $events_container,
item_click_callback: role_selected_handler, item_click_callback: role_selected_handler,
default_id: "0", default_id: section.filters.role_code,
tippy_props: { tippy_props: {
offset: [0, 0], offset: [0, 0],
}, },
@@ -185,11 +186,8 @@ function populate_users() {
section.active.create_table(active_user_ids); section.active.create_table(active_user_ids);
section.deactivated.create_table(deactivated_user_ids); section.deactivated.create_table(deactivated_user_ids);
create_role_filter_dropdown($("#admin-user-list"), section.active.dropdown_widget_name); create_role_filter_dropdown($("#admin-user-list"), section.active);
create_role_filter_dropdown( create_role_filter_dropdown($("#admin-deactivated-users-list"), section.deactivated);
$("#admin-deactivated-users-list"),
section.deactivated.dropdown_widget_name,
);
} }
function reset_scrollbar($sel) { function reset_scrollbar($sel) {