From 9c7f208cc849ea4019447884288bf2c04d43dfc6 Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Mon, 26 Jan 2015 20:31:37 -0800 Subject: [PATCH] fix handling of no installer and one installer cases, RT#16584 --- rt/share/html/Search/Schedule.html | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/rt/share/html/Search/Schedule.html b/rt/share/html/Search/Schedule.html index 8290472e7..34ba142bd 100644 --- a/rt/share/html/Search/Schedule.html +++ b/rt/share/html/Search/Schedule.html @@ -55,11 +55,11 @@ Query => "( Status = 'new' OR Status = 'open' OR Status = 'stalled') AND ( Type = 'reminder' OR 'Type' = 'ticket' )", #XXX and we have the magic custom field - slots => scalar( @{ $ARGS{username} } ), + slots => scalar(@usernames), Embed => 'Schedule.html', DimPast => 1, Display => 'Schedule', - DisplayArgs => [ username => $ARGS{username}, + DisplayArgs => [ username => \@usernames, LengthMin => $LengthMin, #oops, more freeside abstraction-leaking custnum => $ARGS{custnum}, @@ -80,6 +80,17 @@ my @files = (); push @files, map { "${_}contentmws" } qw( iframe ajax ); #%} +my @usernames = (); +if ( ref($ARGS{username}) ) { + @usernames = @{ $ARGS{username} }; +} elsif ( $ARGS{username} ) { + @usernames = ( $ARGS{username} ); +} else { + #XXX shouldn't even get offered the link in the first place rather than perl + # barf, but this is better than erroring out later or empty @username + die "Can't schedule an appointment - no employees are configured as installers"; +} + ( my $LengthMin = $ARGS{LengthMin} ) =~ /^\d+$/ or die 'non-numeric LengthMin'; my $cells = int($LengthMin / $timestep); -- 2.11.0