[otrs-cvs] CVS: otrs/Kernel/Modules AdminQueue.pm,1.22,1.22.2.1

[cvs-log at otrs.org]

Update of /home/cvs/otrs/Kernel/Modules
In directory lancelot:/tmp/cvs-serv755/Kernel/Modules

Modified Files:
      Tag: rel-2_0
	AdminQueue.pm 
Log Message:
fixed bug in parent queue selection

Index: AdminQueue.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/AdminQueue.pm,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -C2 -r1.22 -r1.22.2.1
*** AdminQueue.pm	27 Mar 2005 11:50:50 -0000	1.22
--- AdminQueue.pm	22 Jun 2006 08:04:09 -0000	1.22.2.1
***************
*** 1,5 ****
  # --
  # Kernel/Modules/AdminQueue.pm - to add/update/delete queues
! # Copyright (C) 2001-2005 Martin Edenhofer <martin+code at otrs.org>
  # --
  # $Id$
--- 1,5 ----
  # --
  # Kernel/Modules/AdminQueue.pm - to add/update/delete queues
! # Copyright (C) 2001-2006 Martin Edenhofer <martin+code at otrs.org>
  # --
  # $Id$
***************
*** 216,226 ****
          $Param{Name} = $Queue[$#Queue];
      }
      $Param{'QueueOption'} = $Self->{LayoutObject}->AgentQueueListOption(
!         Data => {
!           $Self->{DBObject}->GetTableData(
!             What => 'id, name',
!             Table => 'queue',
!             Valid => 1,
!           ),
            '' => '-',
          },
--- 216,240 ----
          $Param{Name} = $Queue[$#Queue];
      }
+ 
+     my %Data = $Self->{DBObject}->GetTableData(
+         What => 'id, name',
+         Table => 'queue',
+         Valid => 1,
+     );
+     my $QueueName = '';
+     foreach my $Key (keys %Data) {
+         if ($Param{QueueID} eq $Key) {
+             $QueueName = $Data{$Param{QueueID}};
+             last;
+         }
+     }
+     my %CleanHash = %Data;
+     foreach my $Key (keys %Data) {
+         if ($CleanHash{$Key} eq $QueueName || $CleanHash{$Key} =~ /^$QueueName\:\:/) {
+             delete($CleanHash{$Key});
+         }
+     }
      $Param{'QueueOption'} = $Self->{LayoutObject}->AgentQueueListOption(
!         Data => {%CleanHash,
            '' => '-',
          },