[Rt-commit] rt branch, update-action, updated. 9002518242f7187a18d587352ddf4358f252cf0d

[sartak at bestpractical.com]

The branch, update-action has been updated
       via  9002518242f7187a18d587352ddf4358f252cf0d (commit)
       via  765e0142b57db5c945013b5a01f6ab30f793394c (commit)
      from  7109bd2ddef4e8db05e50017b5ebf35a9c3a85aa (commit)

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

- Log -----------------------------------------------------------------
commit 765e0142b57db5c945013b5a01f6ab30f793394c
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Tue Dec 8 06:51:20 2009 -0500

    Forgot to move the parameter type creators

diff --git a/lib/RT/Action/CreateTicket.pm b/lib/RT/Action/CreateTicket.pm
index 6df07e3..f34d43a 100644
--- a/lib/RT/Action/CreateTicket.pm
+++ b/lib/RT/Action/CreateTicket.pm
@@ -312,13 +312,5 @@ __PACKAGE__->_add_parameter_type(
     },
 );
 
-__PACKAGE__->_add_parameter_type(
-    name => 'ticket_custom_field',
-);
-
-__PACKAGE__->_add_parameter_type(
-    name => 'ticket_transaction_custom_field',
-);
-
 1;
 
diff --git a/lib/RT/Action/TicketAction.pm b/lib/RT/Action/TicketAction.pm
index 6f8b056..435e982 100644
--- a/lib/RT/Action/TicketAction.pm
+++ b/lib/RT/Action/TicketAction.pm
@@ -80,5 +80,13 @@ sub add_ticket_transaction_custom_fields {
     );
 }
 
+__PACKAGE__->_add_parameter_type(
+    name => 'ticket_custom_field',
+);
+
+__PACKAGE__->_add_parameter_type(
+    name => 'ticket_transaction_custom_field',
+);
+
 1;
 

commit 9002518242f7187a18d587352ddf4358f252cf0d
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Tue Dec 8 06:52:06 2009 -0500

    Move _add_parameter_type upwards

diff --git a/lib/RT/Action/CreateTicket.pm b/lib/RT/Action/CreateTicket.pm
index f34d43a..1bf9d0f 100644
--- a/lib/RT/Action/CreateTicket.pm
+++ b/lib/RT/Action/CreateTicket.pm
@@ -246,40 +246,6 @@ sub report_success {
     $self->result->message(_("Created ticket #%1 in queue %2", $id, $queue));
 }
 
-sub _add_parameter_type {
-    my $class = shift;
-    my %args  = @_;
-
-    my $name       = $args{name};
-    my $key        = $args{key} || "_${name}_parameters";
-    my $add_method = $args{add_method} || "add_${name}_parameter";
-    my $get_method = $args{get_method} || "${name}_parameters";
-    my %defaults   = %{ $args{defaults} || {} };
-
-    no strict 'refs';
-
-    *{__PACKAGE__."::$get_method"} = sub {
-        use strict 'refs';
-        my $self = shift;
-        return @{ $self->{$key} || [] };
-    };
-
-    *{__PACKAGE__."::$add_method"} = sub {
-        use strict 'refs';
-        my $self = shift;
-        my %args = @_;
-
-        my $parameter = delete $args{name};
-
-        push @{ $self->{$key} }, $parameter;
-
-        $self->fill_parameter($parameter => (
-            %defaults,
-            %args,
-        ));
-    };
-}
-
 __PACKAGE__->_add_parameter_type(
     name     => 'role_group',
     defaults => {
diff --git a/lib/RT/Action/TicketAction.pm b/lib/RT/Action/TicketAction.pm
index 435e982..3a799e9 100644
--- a/lib/RT/Action/TicketAction.pm
+++ b/lib/RT/Action/TicketAction.pm
@@ -80,6 +80,40 @@ sub add_ticket_transaction_custom_fields {
     );
 }
 
+sub _add_parameter_type {
+    my $class = shift;
+    my %args  = @_;
+
+    my $name       = $args{name};
+    my $key        = $args{key} || "_${name}_parameters";
+    my $add_method = $args{add_method} || "add_${name}_parameter";
+    my $get_method = $args{get_method} || "${name}_parameters";
+    my %defaults   = %{ $args{defaults} || {} };
+
+    no strict 'refs';
+
+    *{__PACKAGE__."::$get_method"} = sub {
+        use strict 'refs';
+        my $self = shift;
+        return @{ $self->{$key} || [] };
+    };
+
+    *{__PACKAGE__."::$add_method"} = sub {
+        use strict 'refs';
+        my $self = shift;
+        my %args = @_;
+
+        my $parameter = delete $args{name};
+
+        push @{ $self->{$key} }, $parameter;
+
+        $self->fill_parameter($parameter => (
+            %defaults,
+            %args,
+        ));
+    };
+}
+
 __PACKAGE__->_add_parameter_type(
     name => 'ticket_custom_field',
 );

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