Merge branch 'rel-10_0' into rel-10_1

RotherOSS · Nov 17, 2023 · fcf8d36 · fcf8d36
2 parents 45fed1b + 1664746
commit fcf8d36
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/Kernel/Modules/AgentTicketService.pm b/Kernel/Modules/AgentTicketService.pm
@@ -512,17 +512,20 @@ sub Run {
     $Data{TicketsShown} = $Count || 0;
 
     # Get ticket count for all services.
-    my @ServiceIDs           = sort { $AllServices{$a} cmp $AllServices{$b} } keys %AllServices;
-    my @AllServicesTicketIDs = $TicketObject->TicketSearch(
-        LockIDs    => \@ViewableLockIDs,
-        StateIDs   => \@ViewableStateIDs,
-        QueueIDs   => \@ViewableQueueIDs,
-        ServiceIDs => \@ServiceIDs,
-        Permission => $Permission,
-        UserID     => $Self->{UserID},
-        Limit      => 20_000,
-        Result     => 'ARRAY',
-    );
+    my @ServiceIDs = sort { $AllServices{$a} cmp $AllServices{$b} } keys %AllServices;
+    my @AllServicesTicketIDs;
+    if (@ServiceIDs) {
+        @AllServicesTicketIDs = $TicketObject->TicketSearch(
+            LockIDs    => \@ViewableLockIDs,
+            StateIDs   => \@ViewableStateIDs,
+            QueueIDs   => \@ViewableQueueIDs,
+            ServiceIDs => \@ServiceIDs,
+            Permission => $Permission,
+            UserID     => $Self->{UserID},
+            Limit      => 20_000,
+            Result     => 'ARRAY',
+        );
+    }
 
     my $TicketCountByServiceID = $TicketObject->TicketCountByAttribute(
         Attribute => 'ServiceID',

diff --git a/Kernel/System/ProcessManagement/TransitionAction/TicketCreate.pm b/Kernel/System/ProcessManagement/TransitionAction/TicketCreate.pm
@@ -571,7 +571,7 @@ sub Run {
             $Kernel::OM->Get('Kernel::System::Log')->Log(
                 Priority => 'error',
                 Message  => $CommonMessage
-                    . "LinkAs $Param{LinkAs} is invalid!"
+                    . "LinkAs $Param{Config}->{LinkAs} is invalid!"
             );
             return;
         }
@@ -597,7 +597,7 @@ sub Run {
             $Kernel::OM->Get('Kernel::System::Log')->Log(
                 Priority => 'error',
                 Message  => $CommonMessage
-                    . "Couldn't Link Tickets $SourceObjectID with $TargetObjectID as $Param{LinkAs}!",
+                    . "Couldn't Link Tickets $SourceObjectID with $TargetObjectID as $Param{Config}->{LinkAs}!",
             );
             return;
         }