diff --git a/src/session/view/content/room_details/permissions/add_members_subpage.rs b/src/session/view/content/room_details/permissions/add_members_subpage.rs index 9465871f..5710b236 100644 --- a/src/session/view/content/room_details/permissions/add_members_subpage.rs +++ b/src/session/view/content/room_details/permissions/add_members_subpage.rs @@ -3,7 +3,7 @@ use gtk::{ CompositeTemplate, glib, glib::{clone, closure, closure_local}, }; -use ruma::{OwnedUserId, events::room::power_levels::PowerLevelUserAction}; +use ruma::OwnedUserId; use tracing::error; use super::{MemberPowerLevel, PermissionsSelectMemberRow, PrivilegedMembers}; @@ -120,11 +120,9 @@ mod imp { return false; }; - // Filter out members whose power level cannot be changed. - permissions.can_do_to_user( - member.user_id(), - PowerLevelUserAction::ChangePowerLevel, - ) + // Since this is a view to add custom power levels, filter out members with + // a custom power level already. + member.power_level() == permissions.default_power_level() } )); } diff --git a/src/session/view/content/room_details/permissions/select_member_row.ui b/src/session/view/content/room_details/permissions/select_member_row.ui index 15e8e357..86989e3d 100644 --- a/src/session/view/content/room_details/permissions/select_member_row.ui +++ b/src/session/view/content/room_details/permissions/select_member_row.ui @@ -31,36 +31,21 @@ - - 6 - - - start - end - - - RoomDetailsPermissionsSelectMemberRow - - - - - - - - - - - RoomDetailsPermissionsSelectMemberRow - - - - + + start + end + + + RoomDetailsPermissionsSelectMemberRow + + + - + True start end @@ -77,7 +62,7 @@ - + False