projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of https://github.com/jgoodman/Freeside
[freeside.git]
/
rt
/
lib
/
RT
/
Approval
/
Rule
/
Passed.pm
diff --git
a/rt/lib/RT/Approval/Rule/Passed.pm
b/rt/lib/RT/Approval/Rule/Passed.pm
index
f364bc9
..
241e604
100644
(file)
--- a/
rt/lib/RT/Approval/Rule/Passed.pm
+++ b/
rt/lib/RT/Approval/Rule/Passed.pm
@@
-2,7
+2,7
@@
#
# COPYRIGHT:
#
#
# COPYRIGHT:
#
-# This software is Copyright (c) 1996-201
2
Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-201
4
Best Practical Solutions, LLC
# <sales@bestpractical.com>
#
# (Except where explicitly superseded by other copyright notices)
# <sales@bestpractical.com>
#
# (Except where explicitly superseded by other copyright notices)
@@
-80,10
+80,8
@@
sub Commit {
}
}
}
}
- $obj->SetStatus(
- Status => $obj->QueueObj->Lifecycle->DefaultStatus('approved') || 'open',
- Force => 1,
- );
+ $obj->SetStatus( Status => $obj->FirstActiveStatus, Force => 1 )
+ if $obj->FirstActiveStatus;
}
my $passed = !$top->HasUnresolvedDependencies( Type => 'approval' );
}
my $passed = !$top->HasUnresolvedDependencies( Type => 'approval' );
@@
-98,6
+96,11
@@
sub Commit {
$top->Correspond( MIMEObj => $template->MIMEObj );
if ($passed) {
$top->Correspond( MIMEObj => $template->MIMEObj );
if ($passed) {
+ my $new_status = $top->QueueObj->Lifecycle->DefaultStatus('approved') || 'open';
+ if ( $new_status ne $top->Status ) {
+ $top->SetStatus( $new_status );
+ }
+
$self->RunScripAction('Notify Owner', 'Approval Ready for Owner',
TicketObj => $top);
}
$self->RunScripAction('Notify Owner', 'Approval Ready for Owner',
TicketObj => $top);
}