Room member details: remove custom power level handling

This commit is contained in:
giomfo 2016-02-29 15:05:22 +01:00
parent 1dd1efb630
commit cd2c8b3c03
2 changed files with 10 additions and 9 deletions

View file

@ -105,10 +105,9 @@
"room_participants_action_remove" = "Remove from this room";
"room_participants_action_ban" = "Block";
"room_participants_action_unban" = "Unblock";
"room_participants_action_set_default_power_level" = "Reset power level";
"room_participants_action_set_default_power_level" = "Reset to normal user";
"room_participants_action_set_moderator" = "Make moderator";
"room_participants_action_set_admin" = "Make admin";
"room_participants_action_set_custom_power_level" = "Set custom power level";
"room_participants_action_start_chat" = "Start chat";
"room_participants_action_start_voice_call" = "Start voice call";
"room_participants_action_start_video_call" = "Start video call";

View file

@ -302,8 +302,11 @@
[actionsArray addObject:@(MXKRoomMemberDetailsActionSetModerator)];
}
[actionsArray addObject:@(MXKRoomMemberDetailsActionSetDefaultPowerLevel)];
[actionsArray addObject:@(MXKRoomMemberDetailsActionSetCustomPowerLevel)];
// Check whether the user is moderator (in this case he may reduce his power level to become normal user).
if (oneSelfPowerLevel >= kVectorRoomModeratorLevel)
{
[actionsArray addObject:@(MXKRoomMemberDetailsActionSetDefaultPowerLevel)];
}
}
}
else if (self.mxRoomMember)
@ -344,8 +347,10 @@
[actionsArray addObject:@(MXKRoomMemberDetailsActionSetModerator)];
}
[actionsArray addObject:@(MXKRoomMemberDetailsActionSetDefaultPowerLevel)];
[actionsArray addObject:@(MXKRoomMemberDetailsActionSetCustomPowerLevel)];
if (memberPowerLevel >= kVectorRoomModeratorLevel)
{
[actionsArray addObject:@(MXKRoomMemberDetailsActionSetDefaultPowerLevel)];
}
}
// Check conditions to be able to kick someone
@ -423,9 +428,6 @@
case MXKRoomMemberDetailsActionSetAdmin:
title = NSLocalizedStringFromTable(@"room_participants_action_set_admin", @"Vector", nil);
break;
case MXKRoomMemberDetailsActionSetCustomPowerLevel:
title = NSLocalizedStringFromTable(@"room_participants_action_set_custom_power_level", @"Vector", nil);
break;
case MXKRoomMemberDetailsActionStartChat:
title = NSLocalizedStringFromTable(@"room_participants_action_start_chat", @"Vector", nil);
break;