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

[sartak at bestpractical.com]

The branch, update-action has been updated
       via  7dc46684a51f5866bdb678168f5d4a201b12d061 (commit)
      from  d6dc15ec7e336fb7e8812a2e68fb2b7094410e6c (commit)

Summary of changes:
 lib/RT/Action/TicketAction.pm |   29 ++++++++++++++++++-----------
 1 files changed, 18 insertions(+), 11 deletions(-)

- Log -----------------------------------------------------------------
commit 7dc46684a51f5866bdb678168f5d4a201b12d061
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Wed Dec 9 04:13:03 2009 -0500

    Various improvements to set_valid_owners

diff --git a/lib/RT/Action/TicketAction.pm b/lib/RT/Action/TicketAction.pm
index 34c3149..e196da5 100644
--- a/lib/RT/Action/TicketAction.pm
+++ b/lib/RT/Action/TicketAction.pm
@@ -60,17 +60,21 @@ sub set_valid_owners {
         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;
+    for my $object ($self->record, $queue) {
+        next if !$object->id;
+
+        my $users = RT::Model::UserCollection->new;
+        $users->who_have_right(
+            right                 => 'OwnTicket',
+            object                => $object,
+            include_system_rights => 1,
+            include_superusers    => $isSU,
+        );
+
+        while (my $user = $users->next) {
+            $user_uniq_hash{ $user->id } = $user;
+        }
     }
 
     # delete nobody here, so we can make them first later
@@ -80,7 +84,10 @@ sub set_valid_owners {
                        values %user_uniq_hash;
     unshift @valid_owners, RT->nobody;
 
-    $self->fill_parameter(owner => valid_values => [ map { $_->id } @valid_owners ]);
+    $self->fill_parameter(owner => (
+        valid_values => [ map { $_->id } @valid_owners ],
+        default_value => $self->record->owner->id,
+    ));
 }
 
 sub add_ticket_custom_fields {

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