X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FTicketSystem.pm;h=c1c69fa3f0f562e0ac87ade2fffe0699e177a590;hb=f12fa1eb90d66448e0e0910bf2770cf5ad2c6199;hp=96980e96b8978361d02b0c8c53c72fd3b399f51f;hpb=856fe5e70c55f191f29db24c7ca8ae6f952de736;p=freeside.git diff --git a/FS/FS/TicketSystem.pm b/FS/FS/TicketSystem.pm index 96980e96b..c1c69fa3f 100644 --- a/FS/FS/TicketSystem.pm +++ b/FS/FS/TicketSystem.pm @@ -209,7 +209,7 @@ sub _upgrade_data { while (my $item = $search->Next) { my ($c, $a, $t) = map {lc $item->$_->Name} ('ScripConditionObj', 'ScripActionObj', 'TemplateObj'); - if ( exists $scrip{$c}{$a}{$t} and $item->Creator == 1 ) { + if ( exists $scrip{$c}{$a} and $item->Creator == 1 ) { warn "Deleting duplicate scrip $c $a [$t]\n"; my ($val, $msg) = $item->Delete; warn "error deleting scrip: $msg\n" if !$val; @@ -220,7 +220,7 @@ sub _upgrade_data { warn "error deleting scrip: $msg\n" if !$val; } else { - $scrip{$c}{$a}{$t} = $item->id; + $scrip{$c}{$a} = $item->id; } } my $Scrip = RT::Scrip->new($CurrentUser); @@ -229,8 +229,8 @@ sub _upgrade_data { my ($c, $a, $t) = map lc, @{ $s }{'ScripCondition', 'ScripAction', 'Template'}; - if ( exists($scrip{$c}{$a}{$t}) ) { - $Scrip->Load( $scrip{$c}{$a}{$t} ); + if ( exists($scrip{$c}{$a}) ) { + $Scrip->Load( $scrip{$c}{$a} ); } else { # need to create it if ( !exists($condition{$c}) ) {