mirror of
https://github.com/rustdesk/rustdesk.git
synced 2025-12-12 11:06:57 +00:00
fix, accessible peers filter considering device group name (#10809)
Signed-off-by: 21pages <sunboeasy@gmail.com>
This commit is contained in:
@@ -562,21 +562,24 @@ class MyGroupPeerView extends BasePeersView {
|
|||||||
);
|
);
|
||||||
|
|
||||||
static bool filter(Peer peer) {
|
static bool filter(Peer peer) {
|
||||||
if (gFFI.groupModel.searchAccessibleItemNameText.isNotEmpty) {
|
final model = gFFI.groupModel;
|
||||||
if (!peer.loginName
|
if (model.searchAccessibleItemNameText.isNotEmpty) {
|
||||||
.contains(gFFI.groupModel.searchAccessibleItemNameText)) {
|
final text = model.searchAccessibleItemNameText.value;
|
||||||
|
final searchPeersOfUser = peer.loginName.contains(text) &&
|
||||||
|
model.users.any((user) => user.name == peer.loginName);
|
||||||
|
final searchPeersOfDeviceGroup = peer.device_group_name.contains(text) &&
|
||||||
|
model.deviceGroups.any((g) => g.name == peer.device_group_name);
|
||||||
|
if (!searchPeersOfUser && !searchPeersOfDeviceGroup) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (gFFI.groupModel.selectedAccessibleItemName.isNotEmpty) {
|
if (model.selectedAccessibleItemName.isNotEmpty) {
|
||||||
if (gFFI.groupModel.isSelectedDeviceGroup.value) {
|
if (model.isSelectedDeviceGroup.value) {
|
||||||
if (gFFI.groupModel.selectedAccessibleItemName.value !=
|
if (model.selectedAccessibleItemName.value != peer.device_group_name) {
|
||||||
peer.device_group_name) {
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (gFFI.groupModel.selectedAccessibleItemName.value !=
|
if (model.selectedAccessibleItemName.value != peer.loginName) {
|
||||||
peer.loginName) {
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user