[Rt-commit] [svn] r1093 - rt/branches/rt-3.1/lib/RT/Action

[alexmv at pallas.eruditorum.org]

Author: alexmv
Date: Wed Jun 16 21:08:55 2004
New Revision: 1093

Modified:
   rt/branches/rt-3.1/lib/RT/Action/CreateTickets.pm
Log:
 * Only insert a default "requestor" line if a default value was
   passed in; this makes the regression suite happy again.


Modified: rt/branches/rt-3.1/lib/RT/Action/CreateTickets.pm
==============================================================================
--- rt/branches/rt-3.1/lib/RT/Action/CreateTickets.pm	(original)
+++ rt/branches/rt-3.1/lib/RT/Action/CreateTickets.pm	Wed Jun 16 21:08:55 2004
@@ -630,9 +630,10 @@
 	    $line =~ s/\r$//;
 	    $RT::Logger->debug("Line: $line");
 	    if ($line =~ /^===$/) {
-		if ($template_id && !$queue) {
+		if ($template_id && !$queue && $qname) {
 		    $self->{'templates'}->{$template_id} .= "Queue: $qname\n";
-		} elsif ($template_id && !$requestor) {
+		}
+		if ($template_id && !$requestor && $requestorname) {
 		    $self->{'templates'}->{$template_id} .= "Requestor: $requestorname\n";
 		}
 		$queue = 0;
@@ -707,6 +708,7 @@
 	    while ($line =~ /($justquoted|$delimited|$empty)/igx) {
 		if ($i == 0) {
 		    $queue = 0;
+		    $requestor = 0;
 		    my $tid = $1;
 		    $tid =~ s/^\s//;
 		    $tid =~ s/\s$//;
@@ -752,10 +754,10 @@
 		}
 		$i++;
 	    }
-	    if (!$queue) {
+	    if (!$queue && $qname) {
 		$self->{'templates'}->{$template_id} .= "Queue: $qname\n";
 	    }
-	    if (!$requestor) {
+	    if (!$requestor && $requestorname) {
 		$self->{'templates'}->{$template_id} .= "Requestor: $requestorname\n";
 	    }
 	}