[otrs-cvs] otrs/Kernel/Modules AgentTicketBulk.pm,1.17,1.18

[CVS commits notifications of OTRS.org]

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

Modified Files:
	AgentTicketBulk.pm 
Log Message:
Improved merge feature.

Author: martin

Index: AgentTicketBulk.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/AgentTicketBulk.pm,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** AgentTicketBulk.pm	4 Nov 2008 14:31:23 -0000	1.17
--- AgentTicketBulk.pm	5 Nov 2008 07:54:21 -0000	1.18
***************
*** 200,205 ****
  
              # merge to
!             my $MergeTo = $Self->{ParamObject}->GetParam( Param => 'MergeTo' );
!             if ($MergeTo) {
                  $MergeTo =~ s/\s+$//g;
                  $MergeTo =~ s/^\s+//g;
--- 200,206 ----
  
              # merge to
!             my $MergeToSelection = $Self->{ParamObject}->GetParam( Param => 'MergeToSelection' );
!             my $MergeTo          = $Self->{ParamObject}->GetParam( Param => 'MergeTo' );
!             if ( $MergeToSelection eq 'MergeTo' && $MergeTo ) {
                  $MergeTo =~ s/\s+$//g;
                  $MergeTo =~ s/^\s+//g;
***************
*** 217,222 ****
  
              # merge to oldest
!             my $MergeToOldest = $Self->{ParamObject}->GetParam( Param => 'MergeToOldest' );
!             if ( !$MergeTo && $MergeToOldest ) {
  
                  # find oldest
--- 218,222 ----
  
              # merge to oldest
!             if ( $MergeToSelection eq 'MergeToOldest' ) {
  
                  # find oldest