Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue #2637: Iterate over group filter arrayref instead of passing array ref as a whole to PermissionGroupGet. #2844

Merged
merged 1 commit into from
Jan 18, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions Kernel/System/DynamicField/Driver/Agent.pm
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ use utf8;
use parent qw(Kernel::System::DynamicField::Driver::BaseReference);

# core modules
use List::Util qw(any);

# CPAN modules

Expand Down Expand Up @@ -320,16 +321,18 @@ sub SearchObjects {
Valid => 1,
);

my $GroupFilter = $Param{DynamicFieldConfig}{Config}{GroupFilter};
my $GroupFilter = $Param{DynamicFieldConfig}{Config}{Group};
if ( IsArrayRefWithData($GroupFilter) ) {
my %GroupAgents = $Kernel::OM->Get('Kernel::System::Group')->PermissionGroupGet(
GroupID => $GroupFilter,
Type => 'ro',
);

for my $UserID ( keys %AgentSearchResult ) {
if ( $GroupAgents{$UserID} ) {
push @Result, $UserID;
for my $GroupID ( $GroupFilter->@* ) {
my %GroupAgents = $Kernel::OM->Get('Kernel::System::Group')->PermissionGroupGet(
GroupID => $GroupID,
Type => 'ro',
);

for my $UserID ( keys %AgentSearchResult ) {
if ( $GroupAgents{$UserID} && !( any { $_ eq $UserID } @Result ) ) {
push @Result, $UserID;
}
}
}
}
Expand Down
Loading