Index: Bugzilla/Search.pm =================================================================== --- Bugzilla/Search.pm +++ Bugzilla/Search.pm @@ -1395,15 +1395,7 @@ as => 'security_cc', extra => ['security_cc.who = ' . $user->id], }; - my $security_triage_join = { - table => 'components', - as => 'security_triage', - from => 'bugs.component_id', - to => 'id', - join => 'LEFT', - extra => ['security_triage.triage_owner_id = ' . $user->id], - }; - push(@joins, $security_cc_join, $security_triage_join); + push @joins, $security_cc_join; } return @joins; @@ -1485,7 +1477,6 @@ OR (bugs.reporter_accessible = 1 AND bugs.reporter = $userid) OR (bugs.cclist_accessible = 1 AND security_cc.who IS NOT NULL) OR bugs.assigned_to = $userid - OR security_triage.triage_owner_id IS NOT NULL END if (Bugzilla->params->{'useqacontact'}) { $security_term .= " OR bugs.qa_contact = $userid"; Index: Bugzilla/User.pm =================================================================== --- Bugzilla/User.pm +++ Bugzilla/User.pm @@ -1489,14 +1489,12 @@ # same result for bug_group_map.bug_id (so DISTINCT filters # out duplicate rows). "SELECT DISTINCT bugs.bug_id, reporter, assigned_to, qa_contact, - components.triage_owner_id, reporter_accessible, - cclist_accessible, cc.who, bug_group_map.bug_id + reporter_accessible, cclist_accessible, cc.who, + bug_group_map.bug_id FROM bugs LEFT JOIN cc ON cc.bug_id = bugs.bug_id AND cc.who = $user_id - LEFT JOIN components - ON bugs.component_id = components.id LEFT JOIN bug_group_map ON bugs.bug_id = bug_group_map.bug_id AND bug_group_map.group_id NOT IN (" @@ -1511,13 +1509,12 @@ $sth->execute(@check_ids); my $use_qa_contact = Bugzilla->params->{'useqacontact'}; while (my $row = $sth->fetchrow_arrayref) { - my ($bug_id, $reporter, $owner, $qacontact, $triage_owner, $reporter_access, - $cclist_access, $isoncclist, $missinggroup) + my ($bug_id, $reporter, $owner, $qacontact, $reporter_access, $cclist_access, + $isoncclist, $missinggroup) = @$row; $visible_cache->{$bug_id} ||= ((($reporter == $user_id) && $reporter_access) || ($use_qa_contact && $qacontact && ($qacontact == $user_id)) - || ($triage_owner && $triage_owner == $user_id) || ($owner == $user_id) || ($isoncclist && $cclist_access) || !$missinggroup) ? 1 : 0; Index: extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl =================================================================== --- extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl +++ extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl @@ -863,6 +863,14 @@ help = "https://wiki.mozilla.org/BMO/UserGuide/BugFields#reporter" %] + [% IF NOT bug.component_obj.triage_owner.can_see_bug(bug.id) %] + [% triager_warning_html = BLOCK %] + + [% END %] + [% END %] + [%# triage owner %] [% INCLUDE bug_modal/field.html.tmpl field = bug_fields.triage_owner @@ -871,6 +879,7 @@ view_only = 1 hide_on_view = bug.component_obj.triage_owner.login == "" help = "https://wiki.mozilla.org/BMO/UserGuide/BugFields#triage_owner" + user_addl_html = triager_warning_html %] [%# needinfo %] Index: extensions/BugModal/template/en/default/bug_modal/field.html.tmpl =================================================================== --- extensions/BugModal/template/en/default/bug_modal/field.html.tmpl +++ extensions/BugModal/template/en/default/bug_modal/field.html.tmpl @@ -36,6 +36,7 @@ # class: (string) optional button class # caption: (string) button caption # hidden: (boolean) don't show the button (default: false) + # user_addl_html : string, if provided will be passed to user.html.tmpl. #%] [% @@ -138,7 +139,7 @@ [% CASE constants.FIELD_TYPE_USER %] [%# users %] - [% INCLUDE bug_modal/user.html.tmpl u=value nick_only=1 gravatar_size=20 %] + [% INCLUDE bug_modal/user.html.tmpl u=value nick_only=1 gravatar_size=20 user_addl_html=user_addl_html %] [% CASE constants.FIELD_TYPE_BUG_URLS %] [%# see also %] Index: extensions/BugModal/template/en/default/bug_modal/groups.html.tmpl =================================================================== --- extensions/BugModal/template/en/default/bug_modal/groups.html.tmpl +++ extensions/BugModal/template/en/default/bug_modal/groups.html.tmpl @@ -108,8 +108,8 @@ [% " disabled=\"disabled\"" UNLESS user_can_edit_accessible %]> - The assignee[% IF (Param('useqacontact')) %], QA contact, [% END %] - and triage owner can always see [% terms.abug %], and this section does not - take effect unless the [% terms.bug %] is restricted to at least one group. + The assignee [% IF (Param('useqacontact')) %]and QA contact[% END %] + can always see [% terms.abug %], and this section does not take effect + unless the [% terms.bug %] is restricted to at least one group. [% END %] Index: extensions/BugModal/template/en/default/bug_modal/user.html.tmpl =================================================================== --- extensions/BugModal/template/en/default/bug_modal/user.html.tmpl +++ extensions/BugModal/template/en/default/bug_modal/user.html.tmpl @@ -13,6 +13,7 @@ # gravatar_only : boolean, if true output just the Gravatar (not-simple only) # nick_only : boolean, if true, the nickname will be used instead of the full name # id : string, if provided the id of the vCard div + # user_addl_html : string, if provided will be rendered after user information inside the same
#%] [% @@ -58,5 +59,6 @@ [% END %] [% END %] + [% user_addl_html FILTER none %] [% END %]