[Rt-commit] r9248 - in rt/branches/3.999-DANGEROUS: html/Elements
html/REST/1.0/Forms/ticket lib/RT/Interface lib/RT/Model
lib/RT/Model/CustomFieldValueCollection t/mail
sunnavy at bestpractical.com
sunnavy at bestpractical.com
Tue Oct 9 10:47:30 EDT 2007
Author: sunnavy
Date: Tue Oct 9 10:47:25 2007
New Revision: 9248
Modified:
rt/branches/3.999-DANGEROUS/html/Elements/PageLayout
rt/branches/3.999-DANGEROUS/html/Elements/SelectOwner
rt/branches/3.999-DANGEROUS/html/Elements/ValidateCustomFields
rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/ticket/attachments
rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/ticket/history
rt/branches/3.999-DANGEROUS/lib/RT/Interface/REST.pm
rt/branches/3.999-DANGEROUS/lib/RT/Model/CustomField.pm
rt/branches/3.999-DANGEROUS/lib/RT/Model/CustomFieldValueCollection/External.pm
rt/branches/3.999-DANGEROUS/t/mail/gateway.t
rt/branches/3.999-DANGEROUS/t/web/cf_access.t
rt/branches/3.999-DANGEROUS/t/web/command_line.t
rt/branches/3.999-DANGEROUS/t/web/ticket_owner.t
Log:
go on cleaning warnings for 3.999
Modified: rt/branches/3.999-DANGEROUS/html/Elements/PageLayout
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Elements/PageLayout (original)
+++ rt/branches/3.999-DANGEROUS/html/Elements/PageLayout Tue Oct 9 10:47:25 2007
@@ -208,7 +208,7 @@
<%init>
if ($current) {
for my $key (keys %$data) {
- next if $data->{$key}->{'path'} ne $current;
+ next if (not $data->{$key}->{'path'}) || $data->{$key}->{'path'} ne $current;
next unless ref( $data->{$key} ) eq 'HASH'
&& ref( $data->{$key}->{'subtabs'} ) eq 'HASH'
&& keys %{ $data->{$key}->{'subtabs'} };
Modified: rt/branches/3.999-DANGEROUS/html/Elements/SelectOwner
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Elements/SelectOwner (original)
+++ rt/branches/3.999-DANGEROUS/html/Elements/SelectOwner Tue Oct 9 10:47:25 2007
@@ -50,7 +50,7 @@
<option <% !$Default ? "SELECTED" : '' %> value=""><%$DefaultLabel%></option>
%}
%foreach my $User ( @users) {
-<option <% (defined $Default && $User->id == $Default) ? "SELECTED" : ''%>
+<option <% ($Default && $User->id == $Default) ? "SELECTED" : ''%>
%if ($ValueAttribute eq 'id') {
value="<%$User->id%>"
%} elsif ($ValueAttribute eq 'Name') {
Modified: rt/branches/3.999-DANGEROUS/html/Elements/ValidateCustomFields
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Elements/ValidateCustomFields (original)
+++ rt/branches/3.999-DANGEROUS/html/Elements/ValidateCustomFields Tue Oct 9 10:47:25 2007
@@ -66,10 +66,10 @@
my @values = ();
if ( ref $value eq 'ARRAY' ) {
@values = @$value;
- } elsif ( $CF->Type =~ /text/i ) {
+ } elsif ( defined $CF->Type && $CF->Type =~ /text/i ) {
@values = ($value);
} else {
- @values = split /\r*\n/, $value;
+ @values = split /\r*\n/, $value || '';
}
@values = grep $_ ne '',
map {
Modified: rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/ticket/attachments
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/ticket/attachments (original)
+++ rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/ticket/attachments Tue Oct 9 10:47:25 2007
@@ -61,10 +61,10 @@
return [ "# Ticket $id does not exist.", [], {}, 1 ];
}
-my @arglist = split('/', $args);
+my @arglist = split('/', $args || '');
my ($aid, $content);
-if ($arglist[1] eq 'content') {
+if ( defined $arglist[1] && $arglist[1] eq 'content') {
$aid = $arglist[0];
$content = 1;
} else {
Modified: rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/ticket/history
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/ticket/history (original)
+++ rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/ticket/history Tue Oct 9 10:47:25 2007
@@ -65,13 +65,19 @@
my $trans = $ticket->Transactions();
my $total = $trans->count();
-chomp $args;
+if ( $args ) {
+ chomp $args;
+}
+else {
+ $args = '';
+}
+
my @arglist = split('/', $args);
my ($type, $tid);
-if ($arglist[0] eq 'type') {
+if ( defined $arglist[0] && $arglist[0] eq 'type') {
$type = $arglist[1];
-} elsif ($arglist[0] eq 'id') {
+} elsif ( defined $arglist[0] && $arglist[0] eq 'id') {
$tid = $arglist[1];
} else {
$type = $args;
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Interface/REST.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Interface/REST.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Interface/REST.pm Tue Oct 9 10:47:25 2007
@@ -198,6 +198,7 @@
$sp = " "x4 if length($sp) > 16;
foreach $v (@values) {
+ $v = '' unless $v;
if ($v =~ /\n/) {
$v =~ s/^/$sp/gm;
$v =~ s/^$sp//;
@@ -268,7 +269,7 @@
foreach $line (map {split /\n/} (ref $val eq 'ARRAY') ? @$val : $val)
{
- # XXX: This should become a real parser, à la Text::ParseWords.
+ # XXX: This should become a real parser, ? la Text::ParseWords.
$line =~ s/^\s+//;
$line =~ s/\s+$//;
push @words, split /\s*,\s*/, $line;
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/CustomField.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/CustomField.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/CustomField.pm Tue Oct 9 10:47:25 2007
@@ -916,7 +916,7 @@
return ( 0, $self->loc('Permission Denied') );
}
- unless ( $self->MatchPattern($args{'Content'}) ) {
+ unless ( $self->MatchPattern($args{'Content'} || '' ) ) {
return ( 0, $self->loc('Input must match [_1]', $self->FriendlyPattern) );
}
@@ -977,7 +977,7 @@
sub MatchPattern {
my $self = shift;
- my $regex = $self->Pattern;
+ my $regex = $self->Pattern || '';
return 1 unless length $regex;
return ($_[0] =~ $regex);
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/CustomFieldValueCollection/External.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/CustomFieldValueCollection/External.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/CustomFieldValueCollection/External.pm Tue Oct 9 10:47:25 2007
@@ -82,7 +82,9 @@
=cut
-sub table {}
+# XXX What's the use of table?
+#sub table {}
+
sub _init {
my $self = shift;
return ( $self->SUPER::_init(@_) );
Modified: rt/branches/3.999-DANGEROUS/t/mail/gateway.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/mail/gateway.t (original)
+++ rt/branches/3.999-DANGEROUS/t/mail/gateway.t Tue Oct 9 10:47:25 2007
@@ -777,7 +777,7 @@
is( $tick->Owner, $user->id, "we changed owner" );
ok( $user->has_right( Right => 'ReplyToTicket', Object => $tick ), "owner can reply to ticket" );
is( $tick->Transactions->count, 5, "transactions added" );
-my $txns = $tick->Transactions;
+$txns = $tick->Transactions;
while (my $t = $txns->next) {
diag( $t->id, $t->Description."\n");
}
Modified: rt/branches/3.999-DANGEROUS/t/web/cf_access.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/web/cf_access.t (original)
+++ rt/branches/3.999-DANGEROUS/t/web/cf_access.t Tue Oct 9 10:47:25 2007
@@ -29,7 +29,7 @@
}
diag "apply the CF to General queue" if $ENV{'TEST_VERBOSE'};
-my $cfid;
+my ( $cf, $cfid, $tid );
{
$m->title_is(q/Created CustomField img/, 'admin-cf Created');
$m->follow_link( text => 'Queues' );
@@ -46,9 +46,10 @@
sort { $a->[0] <=> $b->[0] }
map { /Object-1-CF-(\d+)/ ? [ $1 => $_ ] : () }
grep defined, map $_->name, $m->current_form->inputs;
- $cfid = pop(@names);
- $cfid =~ /(\d+)$/ or die "Hey this is impossible dude";
- $m->field( $cfid => 1 ); # Associate the new CF with this queue
+ $cf = pop(@names);
+ $cf =~ /(\d+)$/ or die "Hey this is impossible dude";
+ $cfid = $1;
+ $m->field( $cf => 1 ); # Associate the new CF with this queue
$m->field( $_ => undef ) for @names; # ...and not any other. ;-)
$m->submit;
@@ -74,7 +75,7 @@
$m->content_unlike(qr/Upload multiple images/, 'has no upload image field');
my $form = $m->form_name("TicketCreate");
- my $upload_field = "Object-RT::Model::Ticket--CustomField-$1-Upload";
+ my $upload_field = "Object-RT::Model::Ticket--CustomField-$cfid-Upload";
ok !$form->find_input( $upload_field ), 'no form field on the page';
$m->submit_form(
@@ -105,14 +106,14 @@
$m->content_unlike(qr/Upload multiple images/, 'has no upload image field');
my $form = $m->form_name("TicketCreate");
- my $upload_field = "Object-RT::Model::Ticket--CustomField-$1-Upload";
+ my $upload_field = "Object-RT::Model::Ticket--CustomField-$cfid-Upload";
ok !$form->find_input( $upload_field ), 'no form field on the page';
$m->submit_form(
form_name => "TicketCreate",
fields => { Subject => 'test' },
);
- my $tid = $1 if $m->content =~ /Ticket (\d+) created/i;
+ $tid = $1 if $m->content =~ /Ticket (\d+) created/i;
ok $tid, "a ticket is Created succesfully";
$m->follow_link( text => 'Custom Fields' );
@@ -129,7 +130,6 @@
);
diag "create a ticket with an image" if $ENV{'TEST_VERBOSE'};
-my $tid;
{
$m->submit_form(
form_name => "CreateTicketInQueue",
Modified: rt/branches/3.999-DANGEROUS/t/web/command_line.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/web/command_line.t (original)
+++ rt/branches/3.999-DANGEROUS/t/web/command_line.t Tue Oct 9 10:47:25 2007
@@ -392,7 +392,7 @@
expect_send("link $link1_id $reln $link2_id", "Link by $reln...");
expect_like(qr/Created link $link1_id $reln $link2_id/, 'Linked');
expect_send("show ticket/$link1_id/links", "Checking creation of $reln...");
- expect_like(qr/$display_relns{reln}: [\w\d\.\-]+:\/\/[\w\d\.]+\/ticket\/$link2_id/, "Created link $reln");
+ expect_like(qr/$display_relns{$reln}: [\w\d\.\-]+:\/\/[\w\d\.]+\/ticket\/$link2_id/, "Created link $reln");
# delete link
expect_send("link -d $link1_id $reln $link2_id", "Delete $reln...");
@@ -421,7 +421,7 @@
# wrap up all the file handling stuff for attachment testing
sub check_attachment {
my $attachment_path = shift;
- (my $filename = $attachment_path) =~ s/.*\/(.*?)$/$1/;
+ (my $filename = $attachment_path) =~ s/.*\/(.*)$/$1/;
expect_send("comment -m 'attach file' -a $attachment_path $ticket_id", "Adding an attachment ($filename)");
expect_like(qr/Message recorded/, "Added the attachment");
expect_send("show ticket/$ticket_id/attachments","Finding Attachment");
Modified: rt/branches/3.999-DANGEROUS/t/web/ticket_owner.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/web/ticket_owner.t (original)
+++ rt/branches/3.999-DANGEROUS/t/web/ticket_owner.t Tue Oct 9 10:47:25 2007
@@ -137,7 +137,7 @@
is $form->value('Owner'), '', 'empty value selected';
$agent_a->submit;
- my $ticket = RT::Model::Ticket->new( RT->SystemUser );
+ $ticket = RT::Model::Ticket->new( RT->SystemUser );
$ticket->load( $id );
ok $ticket->id, 'loaded the ticket';
is $ticket->Owner, $user_b->id, 'correct owner';
More information about the Rt-commit
mailing list