[Rt-commit] r9061 - in rt/branches/3.7-EXPERIMENTAL: lib/RT t/web

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Sat Sep 15 03:27:20 2007
New Revision: 9061

Modified:
   rt/branches/3.7-EXPERIMENTAL/html/Elements/SelectOwner
   rt/branches/3.7-EXPERIMENTAL/lib/RT/Tickets_Overlay.pm
   rt/branches/3.7-EXPERIMENTAL/t/web/ticket_owner.t

Log:
cleaned more warnings

Modified: rt/branches/3.7-EXPERIMENTAL/html/Elements/SelectOwner
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Elements/SelectOwner	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Elements/SelectOwner	Sat Sep 15 03:27:20 2007
@@ -49,8 +49,9 @@
 %if ($DefaultValue) {
 <option <% !$Default ? "SELECTED" : '' %> value=""><%$DefaultLabel%></option>
 %}
+% $Default = 0 unless defined $Default && $Default =~ /^\d+$/;
 %foreach my $User ( @users)  {
-<option <% (defined $Default && $User->Id == $Default) ? "SELECTED" : ''%>
+<option <% ( $User->Id == $Default) ? "SELECTED" : ''%>
 %if ($ValueAttribute eq 'id') {
     value="<%$User->id%>"
 %} elsif ($ValueAttribute eq 'Name') {

Modified: rt/branches/3.7-EXPERIMENTAL/lib/RT/Tickets_Overlay.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/lib/RT/Tickets_Overlay.pm	(original)
+++ rt/branches/3.7-EXPERIMENTAL/lib/RT/Tickets_Overlay.pm	Sat Sep 15 03:27:20 2007
@@ -1394,7 +1394,7 @@
                     = $users = ( $self->_WatcherJoin( $meta->[1] ) )[2];
             }
             push @res, { %$row, ALIAS => $users, FIELD => $subkey };
-       } elsif ( $meta->[0] eq 'CUSTOMFIELD' ) {
+       } elsif ( defined $meta->[0] && $meta->[0] eq 'CUSTOMFIELD' ) {
            my ($queue, $field, $cfid ) = $self->_CustomFieldDecipher( $subkey );
            my $cfkey = $cfid ? $cfid : "$queue.$field";
            my ($TicketCFs, $CFs) = $self->_CustomFieldJoin( $cfkey, $cfid, $field );

Modified: rt/branches/3.7-EXPERIMENTAL/t/web/ticket_owner.t
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/t/web/ticket_owner.t	(original)
+++ rt/branches/3.7-EXPERIMENTAL/t/web/ticket_owner.t	Sat Sep 15 03:27:20 2007
@@ -137,7 +137,7 @@
     is $form->value('Owner'), '', 'empty value selected';
     $agent_a->submit;
 
-    my $ticket = RT::Ticket->new( $RT::SystemUser );
+    $ticket = RT::Ticket->new( $RT::SystemUser );
     $ticket->Load( $id );
     ok $ticket->id, 'loaded the ticket';
     is $ticket->Owner, $user_b->id, 'correct owner';