diff options
Diffstat (limited to 'rt/share/html/Approvals/index.html')
| -rwxr-xr-x | rt/share/html/Approvals/index.html | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/rt/share/html/Approvals/index.html b/rt/share/html/Approvals/index.html index cfd5ab4d5..c72e9afe2 100755 --- a/rt/share/html/Approvals/index.html +++ b/rt/share/html/Approvals/index.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC %# <sales@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -46,10 +46,10 @@ %# %# END BPS TAGGED BLOCK }}} <& /Elements/Header, Title => loc("My approvals") &> -<& /Approvals/Elements/Tabs, Title => loc("My approvals") &> +<& /Elements/Tabs &> <& /Elements/ListActions, actions => \@actions &> -<form method="post"> +<form method="post" name="Approvals" id="Approvals"> <& Elements/PendingMyApproval, %ARGS &> <& /Elements/Submit, Label => loc('Go!') &> </form> @@ -79,11 +79,11 @@ foreach my $arg ( keys %ARGS ) { } my ($val, $msg); - if ( $ARGS{$arg} eq 'deny' ) { - ( $val, $msg ) = $ticket->SetStatus('rejected'); + if ( $ARGS{$arg} eq 'deny' && $ticket->Status !~ /^(rejected|deleted)/ ) { + ( $val, $msg ) = $ticket->SetStatus('rejected'); } - elsif ( $ARGS{$arg} eq 'approve' ) { - ( $val, $msg ) = $ticket->SetStatus('resolved'); + elsif ( $ARGS{$arg} eq 'approve' && $ticket->Status ne 'resolved') { + ( $val, $msg ) = $ticket->SetStatus('resolved'); } push ( @actions, loc("Approval #[_1]: [_2]",$ticket->id, $msg )) if ($msg); } |