Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disallow self-management for admins

Browse source
This commit is contained in:
Conrad Irwin 2024-01-15 19:31:01 -07:00
parent 62232060e6
commit 036e637208
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/collab_ui/src/collab_panel/channel_modal.rs
View file

@ -348,6 +348,10 @@ impl PickerDelegate for ChannelModalDelegate {
fn confirm(&mut self, _: bool, cx: &mut ViewContext<Picker<Self>>) { fn confirm(&mut self, _: bool, cx: &mut ViewContext<Picker<Self>>) {
if let Some((selected_user, role)) = self.user_at_index(self.selected_index) { if let Some((selected_user, role)) = self.user_at_index(self.selected_index) {
if Some(selected_user.id) == self.user_store.read(cx).current_user().map(|user| user.id)
{
return;
}
match self.mode { match self.mode {
Mode::ManageMembers => { Mode::ManageMembers => {
self.show_context_menu(selected_user, role.unwrap_or(ChannelRole::Member), cx) self.show_context_menu(selected_user, role.unwrap_or(ChannelRole::Member), cx)
@ -383,6 +387,7 @@ impl PickerDelegate for ChannelModalDelegate {
) -> Option<Self::ListItem> { ) -> Option<Self::ListItem> {
let (user, role) = self.user_at_index(ix)?; let (user, role) = self.user_at_index(ix)?;
let request_status = self.member_status(user.id, cx); let request_status = self.member_status(user.id, cx);
let is_me = self.user_store.read(cx).current_user().map(|user| user.id) == Some(user.id);
Some( Some(
ListItem::new(ix) ListItem::new(ix)
@ -406,7 +411,10 @@ impl PickerDelegate for ChannelModalDelegate {
Some(ChannelRole::Guest) => Some(Label::new("Guest")), Some(ChannelRole::Guest) => Some(Label::new("Guest")),
_ => None, _ => None,
}) })
.child(IconButton::new("ellipsis", IconName::Ellipsis)) .when(!is_me, |el| {
el.child(IconButton::new("ellipsis", IconName::Ellipsis))
})
.when(is_me, |el| el.child(Label::new("You").color(Color::Muted)))
.children( .children(
if let (Some((menu, _)), true) = (&self.context_menu, selected) { if let (Some((menu, _)), true) = (&self.context_menu, selected) {
Some( Some(