[Rt-commit] rt branch, update-action, updated. 7109bd2ddef4e8db05e50017b5ebf35a9c3a85aa

[sartak at bestpractical.com]

The branch, update-action has been updated
       via  7109bd2ddef4e8db05e50017b5ebf35a9c3a85aa (commit)
      from  d06d867ceaa64ef735acdc08207e2468aa420c09 (commit)

Summary of changes:
 lib/RT/Action/CreateTicket.pm |   25 -------------------------
 lib/RT/Action/TicketAction.pm |   25 +++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 25 deletions(-)

- Log -----------------------------------------------------------------
commit 7109bd2ddef4e8db05e50017b5ebf35a9c3a85aa
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Tue Dec 8 06:44:26 2009 -0500

    Move CF initialization into TicketAction

diff --git a/lib/RT/Action/CreateTicket.pm b/lib/RT/Action/CreateTicket.pm
index 57e68a0..6df07e3 100644
--- a/lib/RT/Action/CreateTicket.pm
+++ b/lib/RT/Action/CreateTicket.pm
@@ -124,9 +124,6 @@ sub after_set_queue {
         label => _('Referred to by'),
     );
 
-    $self->add_ticket_custom_fields($queue);
-    $self->add_ticket_transaction_custom_fields($queue);
-
     $self->set_initial_priority($queue);
     $self->set_final_priority($queue);
 }
@@ -249,28 +246,6 @@ sub report_success {
     $self->result->message(_("Created ticket #%1 in queue %2", $id, $queue));
 }
 
-sub add_ticket_custom_fields {
-    my $self  = shift;
-    my $queue = shift;
-
-    my $cfs = $queue->ticket_custom_fields;
-    $self->_add_custom_fields(
-        cfs    => $cfs,
-        method => 'add_ticket_custom_field_parameter',
-    );
-}
-
-sub add_ticket_transaction_custom_fields {
-    my $self  = shift;
-    my $queue = shift;
-
-    my $cfs = $queue->ticket_transaction_custom_fields;
-    $self->_add_custom_fields(
-        cfs    => $cfs,
-        method => 'add_ticket_transaction_custom_field_parameter',
-    );
-}
-
 sub _add_parameter_type {
     my $class = shift;
     my %args  = @_;
diff --git a/lib/RT/Action/TicketAction.pm b/lib/RT/Action/TicketAction.pm
index 2a0129d..6f8b056 100644
--- a/lib/RT/Action/TicketAction.pm
+++ b/lib/RT/Action/TicketAction.pm
@@ -13,6 +13,9 @@ sub after_set_queue {
 
     $self->set_valid_statuses($queue);
     $self->set_valid_owners($queue);
+
+    $self->add_ticket_custom_fields($queue);
+    $self->add_ticket_transaction_custom_fields($queue);
 }
 
 sub set_valid_statuses {
@@ -55,5 +58,27 @@ sub set_valid_owners {
     $self->fill_parameter(owner => valid_values => [ map { $_->id } @valid_owners ]);
 }
 
+sub add_ticket_custom_fields {
+    my $self  = shift;
+    my $queue = shift;
+
+    my $cfs = $queue->ticket_custom_fields;
+    $self->_add_custom_fields(
+        cfs    => $cfs,
+        method => 'add_ticket_custom_field_parameter',
+    );
+}
+
+sub add_ticket_transaction_custom_fields {
+    my $self  = shift;
+    my $queue = shift;
+
+    my $cfs = $queue->ticket_transaction_custom_fields;
+    $self->_add_custom_fields(
+        cfs    => $cfs,
+        method => 'add_ticket_transaction_custom_field_parameter',
+    );
+}
+
 1;
 

-----------------------------------------------------------------------