diff options
| -rw-r--r-- | FS/FS/TicketSystem.pm | 8 | ||||
| -rwxr-xr-x | rt/share/html/Admin/Elements/EditScrip | 7 |
2 files changed, 6 insertions, 9 deletions
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}) ) { diff --git a/rt/share/html/Admin/Elements/EditScrip b/rt/share/html/Admin/Elements/EditScrip index 05a33d4da..bd1bde71d 100755 --- a/rt/share/html/Admin/Elements/EditScrip +++ b/rt/share/html/Admin/Elements/EditScrip @@ -108,19 +108,16 @@ &> <tr><td class="label"><&|/l&>Template</&>:</td><td class="value">\ -% if ( $immutable ) { -<% $scrip->TemplateObj->Name %> -<input type="hidden" name="Scrip-<%$id%>-Template" value="<% $scrip->TemplateObj->Id %>"> -% } else { +%# immutable flag doesn't affect this <& /Admin/Elements/SelectTemplate, Name => "Scrip-$id-Template", Default => $ARGS{"Scrip-$id-Template"} || $scrip->TemplateObj->Id, Queue => $Queue, &> -% } </td></tr> <tr><td class="label"><&|/l&>Stage</&>:</td><td class="value">\ +%# or this <& /Admin/Elements/SelectStage, Name => "Scrip-$id-Stage", Default => $ARGS{"Scrip-$id-Stage"} || $scrip->Stage, |