Bug 1505793 - Add triage owner in /rest/bug

diff --git a/Bugzilla/WebService/Bug.pm b/Bugzilla/WebService/Bug.pm
index b5704cb517b5eba1c81042b387a1bef5384d9bb6..f13998e4379d26281c47fb9398dac3eec5effb57 100644 (file)
--- a/Bugzilla/WebService/Bug.pm
+++ b/Bugzilla/WebService/Bug.pm
@@ -585,7 +585,7 @@ sub search {
 
     # Backwards compatibility with old method regarding role search
     $match_params->{'reporter'} = delete $match_params->{'creator'} if $match_params->{'creator'};
-    foreach my $role (qw(assigned_to reporter qa_contact commenter cc)) {
+    foreach my $role (qw(assigned_to reporter qa_contact triage_owner commenter cc)) {
         next if !exists $match_params->{$role};
         my $value = delete $match_params->{$role};
         $match_params->{"f${last_field_id}"} = $role;
@@ -1461,6 +1461,13 @@ sub _bug_to_hash {
             $item{'qa_contact_detail'} = $self->_user_to_hash($bug->qa_contact, $params, undef, 'qa_contact');
         }
     }
+    if (filter_wants $params, 'triage_owner', ['extra']) {
+        my $triage_owner = $bug->component_obj->triage_owner;
+        $item{'triage_owner'} = $self->type('email', $triage_owner->login);
+        if ($triage_owner->login) {
+            $item{'triage_owner_detail'} = $self->_user_to_hash($triage_owner, $params, ['extra'], 'triage_owner');
+        }
+    }
     if (filter_wants $params, 'see_also') {
         my @see_also = map { $self->type('string', $_->name) }
                        @{ $bug->see_also };
@@ -2770,6 +2777,21 @@ C<string> The summary of this bug.
 C<string> The milestone that this bug is supposed to be fixed by, or for
 closed bugs, the milestone that it was fixed for.
 
+=item C<triage_owner>
+
+C<string> The login name of the Triage Owner of the bug's component.
+
+This is an B<extra> field returned only by specifying C<triage_owner> or
+C<_extra> in C<include_fields>.
+
+=item C<triage_owner_detail>
+
+C<hash> A hash containing detailed user information for the C<triage_owner>. To
+see the keys included in the user detail hash, see below.
+
+As with C<triage_owner>, this is an B<extra> field returned only by specifying
+C<triage_owner> or C<_extra> in C<include_fields>.
+
 =item C<update_token>
 
 C<string> The token that you would have to pass to the F<process_bug.cgi>
@@ -2939,7 +2961,7 @@ and all custom fields.
 =item The C<actual_time> item was added to the C<bugs> return value
 in Bugzilla B<4.4>.
 
-=item The C<duplicates> array was added in Bugzilla B<6.0>.
+=item The C<duplicates> and C<triage_owner> items were added in Bugzilla B<6.0>.
 
 =back
 
@@ -3285,6 +3307,10 @@ this Bugzilla does not have the QA Contact field enabled, you can
 still search for bugs by QA Contact (though it is likely that no bug
 will have a QA Contact set, if the field is disabled).
 
+=item C<triage_owner>
+
+C<string> The login name of the Triage Owner of a bug's component.
+
 =item C<url>
 
 C<string> The "URL" field of a bug.

diff --git a/docs/en/rst/api/core/v1/bug.rst b/docs/en/rst/api/core/v1/bug.rst
index bab2cd0e81e2c6498f37e74bc709c660f31471aa..9ce7fc45475a68234832b2148637257a2e9b0f1c 100644 (file)
--- a/docs/en/rst/api/core/v1/bug.rst
+++ b/docs/en/rst/api/core/v1/bug.rst
@@ -62,6 +62,7 @@ name              type   description
          "resolution": "INVALID",
          "id": 35,
          "qa_contact": "",
+         "triage_owner": "",
          "version": "1.0",
          "status": "RESOLVED",
          "creator": "user@bugzilla.org",
@@ -239,13 +240,18 @@ Extra fields:
 These fields are returned only by specifying ``_extra`` or the field name in
 ``include_fields``.
 
-====  =====  ====================================================================
-name  type   description
-====  =====  ====================================================================
-tags  array  Each array item is a tag name. Note that tags are
-             personal to the currently logged in user and are not the same as
-             comment tags.
-====  =====  ====================================================================
+===================  ======  ====================================================
+name                 type    description
+===================  ======  ====================================================
+tags                 array   Each array item is a tag name. Note that tags are
+                             personal to the currently logged in user and are not
+                             the same as comment tags.
+triage_owner         string  The login name of the Triage Owner of the bug's
+                             component.
+triage_owner_detail  object  An object containing detailed user information for
+                             the ``triage_owner``. To see the keys included in
+                             the user detail object, see below.
+===================  ======  ====================================================
 
 User object:
 
@@ -528,6 +534,8 @@ qa_contact        string    The login name of the bug's QA Contact. Note that
                             field enabled, you can still search for bugs by QA
                             Contact (though it is likely that no bug will have a
                             QA Contact set, if the field is disabled).
+triage_owner      string    The login name of the Triage Owner of a bug's
+                            component.
 url               string    The "URL" field of a bug.
 version           string    The Version field of a bug.
 whiteboard        string    Search the "Status Whiteboard" field on bugs for a