Bug 1033258 - bzexport fails to leave a comment when attaching a file using the BzAPI compatibility layer

David Lawrence · David Lawrence · commit e0d898d3883c · 2014-07-02T16:39:32.000Z
diff --git a/extensions/BzAPI/lib/Resources/Bug.pm b/extensions/BzAPI/lib/Resources/Bug.pm
@@ -587,6 +587,12 @@ sub add_attachment_request {
             }
         }
     }
+
+    # Add comment if one is provided
+    if (exists $params->{comments} && scalar @{ $params->{comments} }) {
+        $params->{comment} = $params->{comments}->[0]->{text};
+        delete $params->{comments};
+    }
 }
 
 sub update_attachment_request {
@@ -613,8 +619,9 @@ sub update_attachment_request {
             }
         }
     }
+
     # Add comment if one is provided
-    if ($params->{comments}) {
+    if (exists $params->{comments} && scalar @{ $params->{comments} }) {
         $params->{comment} = $params->{comments}->[0]->{text};
         delete $params->{comments};
     }

Original file line number	Diff line number	Diff line change
`@@ -587,6 +587,12 @@ sub add_attachment_request {`
`587`	`587`	`}`
`588`	`588`	`}`
`589`	`589`	`}`
	`590`	`+`
	`591`	`+ # Add comment if one is provided`
	`592`	`+ if (exists $params->{comments} && scalar @{ $params->{comments} }) {`
	`593`	`+ $params->{comment} = $params->{comments}->[0]->{text};`
	`594`	`+ delete $params->{comments};`
	`595`	`+ }`
`590`	`596`	`}`
`591`	`597`
`592`	`598`	`sub update_attachment_request {`
`@@ -613,8 +619,9 @@ sub update_attachment_request {`
`613`	`619`	`}`
`614`	`620`	`}`
`615`	`621`	`}`
	`622`	`+`
`616`	`623`	`# Add comment if one is provided`
`617`		`- if ($params->{comments}) {`
	`624`	`+ if (exists $params->{comments} && scalar @{ $params->{comments} }) {`
`618`	`625`	`$params->{comment} = $params->{comments}->[0]->{text};`
`619`	`626`	`delete $params->{comments};`
`620`	`627`	`}`