fix, accessible peers filter considering device group name (#10809)

Signed-off-by: 21pages <sunboeasy@gmail.com>
This commit is contained in:
21pages 2025-02-17 17:36:47 +08:00 committed by GitHub
parent c150143d86
commit fa49c72835
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -562,21 +562,24 @@ class MyGroupPeerView extends BasePeersView {
);
static bool filter(Peer peer) {
if (gFFI.groupModel.searchAccessibleItemNameText.isNotEmpty) {
if (!peer.loginName
.contains(gFFI.groupModel.searchAccessibleItemNameText)) {
final model = gFFI.groupModel;
if (model.searchAccessibleItemNameText.isNotEmpty) {
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;
}
}
if (gFFI.groupModel.selectedAccessibleItemName.isNotEmpty) {
if (gFFI.groupModel.isSelectedDeviceGroup.value) {
if (gFFI.groupModel.selectedAccessibleItemName.value !=
peer.device_group_name) {
if (model.selectedAccessibleItemName.isNotEmpty) {
if (model.isSelectedDeviceGroup.value) {
if (model.selectedAccessibleItemName.value != peer.device_group_name) {
return false;
}
} else {
if (gFFI.groupModel.selectedAccessibleItemName.value !=
peer.loginName) {
if (model.selectedAccessibleItemName.value != peer.loginName) {
return false;
}
}