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

[sartak at bestpractical.com]

The branch, update-action has been updated
       via  46f45b495963d38a4c0510c260fc0a29eb408657 (commit)
      from  368de96ba6854c2cb56ed15355f91c3fa5ce7f36 (commit)

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

- Log -----------------------------------------------------------------
commit 46f45b495963d38a4c0510c260fc0a29eb408657
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Tue Dec 8 05:29:19 2009 -0500

    Move set_valid_owners into TicketAction

diff --git a/lib/RT/Action/CreateTicket.pm b/lib/RT/Action/CreateTicket.pm
index e733e9e..f6e4e35 100644
--- a/lib/RT/Action/CreateTicket.pm
+++ b/lib/RT/Action/CreateTicket.pm
@@ -50,7 +50,6 @@ sub after_set_queue {
     $self->SUPER::after_set_queue(@_);
 
     $self->set_valid_statuses($queue);
-    $self->set_valid_owners($queue);
     $self->setup_gnupg($queue);
 
     $self->add_role_group_parameter(
@@ -141,38 +140,6 @@ sub set_valid_statuses {
     $self->fill_parameter(status => valid_values => \@valid_statuses);
 }
 
-sub set_valid_owners {
-    my $self  = shift;
-    my $queue = shift;
-
-    my $isSU = Jifty->web->current_user->has_right(
-        right  => 'SuperUser',
-        object => RT->system,
-    );
-
-    my $users = RT::Model::UserCollection->new;
-    $users->who_have_right(
-        right                 => 'OwnTicket',
-        object                => $queue,
-        include_system_rights => 1,
-        include_superusers    => $isSU,
-    );
-
-    my %user_uniq_hash;
-    while (my $user = $users->next) {
-        $user_uniq_hash{ $user->id } = $user;
-    }
-
-    # delete nobody here, so we can make them first later
-    delete $user_uniq_hash{RT->nobody->id};
-
-    my @valid_owners = sort { uc( $a->name ) cmp uc( $b->name ) }
-                       values %user_uniq_hash;
-    unshift @valid_owners, RT->nobody;
-
-    $self->fill_parameter(owner => valid_values => [ map { $_->id } @valid_owners ]);
-}
-
 sub setup_gnupg {
     my $self  = shift;
     my $queue = shift;
diff --git a/lib/RT/Action/TicketAction.pm b/lib/RT/Action/TicketAction.pm
index ecef656..7648156 100644
--- a/lib/RT/Action/TicketAction.pm
+++ b/lib/RT/Action/TicketAction.pm
@@ -6,5 +6,45 @@ use base 'RT::Action::QueueBased', 'RT::Action::WithCustomFields';
 use constant record_class => 'RT::Model::Ticket';
 use constant report_detailed_messages => 1;
 
+sub after_set_queue {
+    my $self  = shift;
+    my $queue = shift;
+    $self->SUPER::after_set_queue($queue, @_);
+
+    $self->set_valid_owners($queue);
+}
+
+sub set_valid_owners {
+    my $self  = shift;
+    my $queue = shift;
+
+    my $isSU = Jifty->web->current_user->has_right(
+        right  => 'SuperUser',
+        object => RT->system,
+    );
+
+    my $users = RT::Model::UserCollection->new;
+    $users->who_have_right(
+        right                 => 'OwnTicket',
+        object                => $queue,
+        include_system_rights => 1,
+        include_superusers    => $isSU,
+    );
+
+    my %user_uniq_hash;
+    while (my $user = $users->next) {
+        $user_uniq_hash{ $user->id } = $user;
+    }
+
+    # delete nobody here, so we can make them first later
+    delete $user_uniq_hash{RT->nobody->id};
+
+    my @valid_owners = sort { uc( $a->name ) cmp uc( $b->name ) }
+                       values %user_uniq_hash;
+    unshift @valid_owners, RT->nobody;
+
+    $self->fill_parameter(owner => valid_values => [ map { $_->id } @valid_owners ]);
+}
+
 1;
 

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