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

user_group: Disable leave checkmark if user isn't a direct member.

Browse Source 
If the user is not a direct member, but a member via a subgroup, we will
show the list of subgroups beloging to that group which the current user
is a direct member of in a tooltip. The cursor on the checkmark will be
default in this case instead of a pointer.
This commit is contained in:
Shubham Padia
2024-11-27 04:39:03 +00:00
committed by Tim Abbott
parent 8a28b31be3
commit bf73e1711d
5 changed files with 112 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
web/src/user_group_edit.js
View File

@@ -324,6 +324,16 @@ export function handle_member_edit_event(group_id, user_ids) {
item.is_member = user_groups.is_user_in_group(group_id, people.my_current_user_id());
item.can_join = settings_data.can_join_user_group(item.id);
item.can_leave = settings_data.can_leave_user_group(item.id);
item.is_direct_member = user_groups.is_direct_member_of(
people.my_current_user_id(),
item.id,
);
const associated_subgroups = user_groups.get_associated_subgroups(
item,
people.my_current_user_id(),
);
item.associated_subgroup_names =
user_groups.group_list_to_comma_seperated_name(associated_subgroups);
const html = render_browse_user_groups_list_item(item);
const $new_row = $(html);
@@ -890,6 +900,16 @@ export function setup_page(callback) {
get_item: ListWidget.default_get_item,
modifier_html(item) {
item.is_member = user_groups.is_user_in_group(item.id, people.my_current_user_id());
item.is_direct_member = user_groups.is_direct_member_of(
people.my_current_user_id(),
item.id,
);
const associated_subgroups = user_groups.get_associated_subgroups(
item,
people.my_current_user_id(),
);
item.associated_subgroup_names =
user_groups.group_list_to_comma_seperated_name(associated_subgroups);
item.can_join = settings_data.can_join_user_group(item.id);
item.can_leave = settings_data.can_leave_user_group(item.id);
return render_browse_user_groups_list_item(item);
@@ -1109,7 +1129,10 @@ export function initialize() {
});
$("#groups_overlay_container").on("click", ".join_leave_button", (e) => {
if ($(e.currentTarget).hasClass("disabled")) {
if (
$(e.currentTarget).hasClass("disabled") ||
$(e.currentTarget).hasClass("not-direct-member")
) {
// We return early if user is not allowed to join or leave a group.
return;
}