--- WebRT/html/Ticket/Update.html	Wed Feb 20 20:45:38 2002
+++ local/WebRT/html/Ticket/Update.html	Sat Oct 12 13:09:49 2002
@@ -32,7 +32,7 @@
 <td>
 <& /Elements/SelectStatus, Name=>"Status", Default => $DefaultStatus &>
 Owner:  
-<& /Elements/SelectOwner, Name=>"Owner", Default => $Ticket->OwnerObj->Id(), QueueObj => $Ticket->QueueObj, TicketObj => $Ticket &>
+<& /Elements/SelectOwner, Name=>"Owner", Default => $DefaultOwner, QueueObj => $Ticket->QueueObj, TicketObj => $Ticket &>
 Worked: <input size=4 name="UpdateTimeWorked"> minutes</td></tr>
 <tr><td align=right>Update Type:</td>
 <td><select name="UpdateType">
@@ -72,6 +72,7 @@
 my $CanRespond = 0;
 my $CanComment = 0;
 my $title;
+my $DefaultOwner;
 
 my $Ticket = LoadTicket($id);
 
@@ -89,7 +90,21 @@
 my $CommentDefault=$Action eq "Comment" ? "SELECTED" : "";
 my $ResponseDefault=$Action eq "Respond" ? "SELECTED" : "";
 
 $DefaultStatus = $Ticket->Status() unless ($DefaultStatus);
+#unless ($DefaultStatus) {
+#       $DefaultStatus = $Ticket->Status();
+#       if ($DefaultStatus eq "open" && $Action eq "Respond") {
+#               $DefaultStatus= "resolved";
+#       }
+#}
+if ($Ticket->OwnerObj->Id == $RT::Nobody->Id() &&
+$session{'CurrentUser'}->HasQueueRight(Right => 'OwnTicket',
+QueueObj => $Ticket->QueueObj,
+TicketObj => $Ticket)) {
+$DefaultOwner=$session{'CurrentUser'}->Id;
+} else {
+$DefaultOwner=$Ticket->OwnerObj->Id();
+}
 
 $CanRespond = 1 if ( $Ticket->CurrentUserHasRight('ReplyToTicket') or
                      $Ticket->CurrentUserHasRight('ModifyTicket') );