diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2012-06-07 00:56:06 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2012-06-07 00:56:06 -0700 |
| commit | 43a06151e47d2c59b833cbd8c26d97865ee850b6 (patch) | |
| tree | 42c51d94e7fa265461b508d061562be204ccc2c1 /rt/lib/RT/Approval | |
| parent | 6587f6ba7d047ddc1686c080090afe7d53365bd4 (diff) | |
starting to work...
Diffstat (limited to 'rt/lib/RT/Approval')
| -rw-r--r-- | rt/lib/RT/Approval/Rule.pm | 8 | ||||
| -rw-r--r-- | rt/lib/RT/Approval/Rule/Created.pm | 2 | ||||
| -rw-r--r-- | rt/lib/RT/Approval/Rule/NewPending.pm | 2 | ||||
| -rw-r--r-- | rt/lib/RT/Approval/Rule/Passed.pm | 7 | ||||
| -rw-r--r-- | rt/lib/RT/Approval/Rule/Rejected.pm | 4 |
5 files changed, 15 insertions, 8 deletions
diff --git a/rt/lib/RT/Approval/Rule.pm b/rt/lib/RT/Approval/Rule.pm index 420124060..85526c1d8 100644 --- a/rt/lib/RT/Approval/Rule.pm +++ b/rt/lib/RT/Approval/Rule.pm @@ -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) @@ -57,7 +57,11 @@ use constant _Queue => '___Approvals'; sub Prepare { my $self = shift; return unless $self->SUPER::Prepare(); - $self->TicketObj->Type eq 'approval'; + if (($self->TicketObj->__Value('Type')||'') eq 'approval') { + return 1; + } else { + return undef + } } sub GetTemplate { diff --git a/rt/lib/RT/Approval/Rule/Created.pm b/rt/lib/RT/Approval/Rule/Created.pm index 40382f9ef..cd4519c2e 100644 --- a/rt/lib/RT/Approval/Rule/Created.pm +++ b/rt/lib/RT/Approval/Rule/Created.pm @@ -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) diff --git a/rt/lib/RT/Approval/Rule/NewPending.pm b/rt/lib/RT/Approval/Rule/NewPending.pm index 026f7e680..d2ba3ac4e 100644 --- a/rt/lib/RT/Approval/Rule/NewPending.pm +++ b/rt/lib/RT/Approval/Rule/NewPending.pm @@ -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) diff --git a/rt/lib/RT/Approval/Rule/Passed.pm b/rt/lib/RT/Approval/Rule/Passed.pm index e0560bac1..f364bc926 100644 --- a/rt/lib/RT/Approval/Rule/Passed.pm +++ b/rt/lib/RT/Approval/Rule/Passed.pm @@ -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) @@ -80,7 +80,10 @@ sub Commit { } } - $obj->SetStatus( Status => 'open', Force => 1 ); + $obj->SetStatus( + Status => $obj->QueueObj->Lifecycle->DefaultStatus('approved') || 'open', + Force => 1, + ); } my $passed = !$top->HasUnresolvedDependencies( Type => 'approval' ); diff --git a/rt/lib/RT/Approval/Rule/Rejected.pm b/rt/lib/RT/Approval/Rule/Rejected.pm index a97cf47b2..b22df5c2d 100644 --- a/rt/lib/RT/Approval/Rule/Rejected.pm +++ b/rt/lib/RT/Approval/Rule/Rejected.pm @@ -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) @@ -75,7 +75,7 @@ sub Commit { # XXX: from custom prepare code $rejected->Correspond( MIMEObj => $template->MIMEObj ); $rejected->SetStatus( - Status => 'rejected', + Status => $rejected->QueueObj->Lifecycle->DefaultStatus('denied') || 'rejected', Force => 1, ); } |