projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
default to a session cookie instead of setting an explicit timeout, weird timezone...
[freeside.git]
/
rt
/
lib
/
RT
/
Rule.pm
diff --git
a/rt/lib/RT/Rule.pm
b/rt/lib/RT/Rule.pm
index
86ff63d
..
47c26f1
100644
(file)
--- a/
rt/lib/RT/Rule.pm
+++ b/
rt/lib/RT/Rule.pm
@@
-2,7
+2,7
@@
#
# COPYRIGHT:
#
#
# COPYRIGHT:
#
-# This software is Copyright (c) 1996-201
1
Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-201
9
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)
@@
-49,15
+49,24
@@
package RT::Rule;
use strict;
use warnings;
package RT::Rule;
use strict;
use warnings;
+
use base 'RT::Action';
use constant _Stage => 'TransactionCreate';
use constant _Queue => undef;
use base 'RT::Action';
use constant _Stage => 'TransactionCreate';
use constant _Queue => undef;
+
+
sub Prepare {
my $self = shift;
sub Prepare {
my $self = shift;
- return (0) if $self->_Queue && $self->TicketObj->QueueObj->Name ne $self->_Queue;
- return 1;
+ if ( $self->_Queue ) {
+ my $queue = RT::Queue->new( RT->SystemUser );
+ $queue->Load( $self->TicketObj->__Value('Queue') );
+ if ( $queue->Name ne $self->_Queue ) {
+ return (0);
+ }
+ return 1;
+ }
}
sub Commit {
}
sub Commit {
@@
-94,11
+103,10
@@
sub RunScripAction {
my $action = $ScripAction->LoadAction( TransactionObj => $self->TransactionObj,
TicketObj => $self->TicketObj,
my $action = $ScripAction->LoadAction( TransactionObj => $self->TransactionObj,
TicketObj => $self->TicketObj,
+ TemplateObj => $template,
%args,
);
%args,
);
- # XXX: fix template to allow additional arguments to be passed from here
- $action->{'TemplateObj'} = $template;
$action->{'ScripObj'} = RT::Scrip->new($self->CurrentUser); # Stub. sendemail action really wants a scripobj available
$action->Prepare or return;
$action->Commit;
$action->{'ScripObj'} = RT::Scrip->new($self->CurrentUser); # Stub. sendemail action really wants a scripobj available
$action->Prepare or return;
$action->Commit;