From: Kohei Yoshino <kohei.yoshino@gmail.com>
Date: Fri, 9 Nov 2018 18:28:44 +0000 (-0500)
Subject: Revert "Bug 1505793 - Add triage owner in /rest/bug"
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09941e3d44c024978973198967b972cdc8a1c5ae;p=thirdparty%2Fbugzilla.git

Revert "Bug 1505793 - Add triage owner in /rest/bug"
---

diff --git a/Bugzilla/WebService/Bug.pm b/Bugzilla/WebService/Bug.pm
index 31289d8fc..b5704cb51 100644
--- 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 triage_owner commenter cc)) {
+    foreach my $role (qw(assigned_to reporter qa_contact commenter cc)) {
         next if !exists $match_params->{$role};
         my $value = delete $match_params->{$role};
         $match_params->{"f${last_field_id}"} = $role;
@@ -1461,13 +1461,6 @@ 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') {
-        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, undef, 'triage_owner');
-        }
-    }
     if (filter_wants $params, 'see_also') {
         my @see_also = map { $self->type('string', $_->name) }
                        @{ $bug->see_also };
@@ -2741,15 +2734,6 @@ C<string> The login name of the current QA Contact on the bug.
 C<hash> A hash containing detailed user information for the qa_contact. To see the
 keys included in the user detail hash, see below.
 
-=item C<triage_owner>
-
-C<string> The login name of the Triage Owner of the bug's component.
-
-=item C<triage_owner_detail>
-
-C<hash> A hash containing detailed user information for the triage_owner. To see
-the keys included in the user detail hash, see below.
-
 =item C<remaining_time>
 
 C<double> The number of hours of work remaining until work on this bug
@@ -2955,7 +2939,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> and C<triage_owner> items were added in Bugzilla B<6.0>.
+=item The C<duplicates> array was added in Bugzilla B<6.0>.
 
 =back
 
@@ -3301,10 +3285,6 @@ 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 674b2fcff..bab2cd0e8 100644
--- a/docs/en/rst/api/core/v1/bug.rst
+++ b/docs/en/rst/api/core/v1/bug.rst
@@ -62,7 +62,6 @@ name              type   description
          "resolution": "INVALID",
          "id": 35,
          "qa_contact": "",
-         "triage_owner": "",
          "version": "1.0",
          "status": "RESOLVED",
          "creator": "user@bugzilla.org",
@@ -215,11 +214,6 @@ summary                string    The summary of this bug.
 target_milestone       string    The milestone that this bug is supposed to be
                                  fixed by, or for closed bugs, the milestone that
                                  it was fixed for.
-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.
 update_token           string    The token that you would have to pass to the
                                  ``process_bug.cgi`` page in order to update this
                                  bug. This changes every time the bug is updated.
@@ -534,8 +528,6 @@ 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