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

[sartak at bestpractical.com]

The branch, update-action has been updated
       via  a8d9cfc308826e6df1b64ad1fe5bcee4c8a521b0 (commit)
      from  a306ca417697c32d2bb2dbc607546fd31d6b4d29 (commit)

Summary of changes:
 lib/RT/Action/UpdateTicket.pm |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

- Log -----------------------------------------------------------------
commit a8d9cfc308826e6df1b64ad1fe5bcee4c8a521b0
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Wed Jan 13 19:37:24 2010 -0500

    In UpdateTicket, merge arguments from both superclass hierarchies

diff --git a/lib/RT/Action/UpdateTicket.pm b/lib/RT/Action/UpdateTicket.pm
index 033bbda..f6d55fb 100644
--- a/lib/RT/Action/UpdateTicket.pm
+++ b/lib/RT/Action/UpdateTicket.pm
@@ -26,6 +26,23 @@ use Jifty::Action schema {
         label is _('Subject');
 };
 
+sub arguments {
+    my $self = shift;
+    return $self->Jifty::Action::Record::Update::arguments(@_);
+
+    if (!$self->{_cached_arguments}) {
+        my $ticket_args = $self->RT::Action::TicketAction::arguments(@_);
+        my $update_args = $self->Jifty::Action::Record::Update::arguments(@_);
+
+        $self->{_cached_arguments} = Jifty::Param::Schema::merge_params(
+            $update_args,
+            $ticket_args,
+        );
+    }
+
+    return $self->{_cached_arguments};
+}
+
 sub _valid_statuses {
     my $self = shift;
 

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