Merge branch 'master' of git.freeside.biz:/home/git/freeside

1 files changed, 14 insertions, 5 deletions

diff --git a/httemplate/misc/xmlhttp-ticket-update.html b/httemplate/misc/xmlhttp-ticket-update.html
index e81e353c5..01fb1b44d 100644
--- a/httemplate/misc/xmlhttp-ticket-update.html
+++ b/httemplate/misc/xmlhttp-ticket-update.html
@@ -13,7 +13,13 @@ my $ticket = FS::TicketSystem->get_ticket_object( \%session, ticket_id=>$id );
 my $return;
 if ( $ticket ) {
 
-  my($orv, $omsg) = $ticket->SetOwner( $username );
+  my $curowner = $ticket->OwnerObj->Name;
+  my($orv, $omsg);
+  if (( $curowner eq $FS::CurrentUser::CurrentUser->username ) or ( $curowner eq 'nobody' )) {
+    ($orv, $omsg) = $ticket->SetOwner( $username );
+  } else {
+    ($orv, $omsg) = $ticket->SetOwner( $username, 'Steal' );
+  }
   $orv = 1 if ! $orv && $omsg =~ /already own/i;
 
   if ( $orv ) {
@@ -40,15 +46,18 @@ if ( $ticket ) {
       my %hash = $m->comp('/rt/Ticket/Elements/Customers', Ticket => $ticket);
       my @cust_main = values( %{$hash{cust_main}} );
 
+      my $timelabel = FS::sched_avail::pretty_time($sh*60+$sm). '-'.
+                      FS::sched_avail::pretty_time($eh*60+$em);
+      my $titlelabel = encode_entities($cust_main[0]->_FreesideURILabel);
+
       $return = { 'error'       => '',
                   #'starts'      => $starts,
                   #'due'         => $due,
                   #'username'    => $username,
                                    #false laziness w/CalendarSlotSchedule
-                  'sched_label' =>
-                     FS::sched_avail::pretty_time($sh*60+$sm). '-'.
-                     FS::sched_avail::pretty_time($eh*60+$em). ': '.
-                     encode_entities($cust_main[0]->_FreesideURILabel),
+                  'sched_label' => $timelabel . ': ' . $titlelabel,
+                  'sched_label_time' => $timelabel,
+                  'sched_label_title' => $titlelabel,
                 };
     } else {
       $return = { 'error' => $smsg };