Bug 989647 - Bug.update_attachment should allow for adding a comment when updating...

r=glob,a=justdave

diff --git a/Bugzilla/WebService/Bug.pm b/Bugzilla/WebService/Bug.pm
index 3af8169b44fda46ee1615c78790c787cfec9185f..204e31183ae54a55099a75b76b4f2d2026fcaf8b 100644 (file)
--- a/Bugzilla/WebService/Bug.pm
+++ b/Bugzilla/WebService/Bug.pm
@@ -860,6 +860,7 @@ sub update_attachment {
     }
 
     my $flags = delete $params->{flags};
+    my $comment = delete $params->{comment};
 
     # Update the values
     foreach my $attachment (@attachments) {
@@ -877,6 +878,13 @@ sub update_attachment {
     foreach my $attachment (@attachments) {
         my $changes = $attachment->update();
 
+        if ($comment = trim($comment)) {
+            $attachment->bug->add_comment($comment,
+                { isprivate  => $attachment->isprivate,
+                  type       => CMT_ATTACHMENT_UPDATED,
+                  extra_data => $attachment->id });
+        }
+
         $changes = translate($changes, ATTACHMENT_MAPPED_RETURNS);
 
         my %hash = (
@@ -904,7 +912,8 @@ sub update_attachment {
 
     # Email users about the change
     foreach my $bug (values %bugs) {
-        Bugzilla::BugMail::Send($bug->id, { 'changer' => $user });
+        $bug->update();
+        $bug->send_changes();
     }
 
     # Return the information to the user
@@ -3589,6 +3598,10 @@ in the UI for this attachment.
 C<string> A short string describing the
 attachment.
 
+=item C<comment>
+
+C<string> An optional comment to add to the attachment's bug.
+
 =item C<content_type>
 
 C<string> The MIME type of the attachment, like