From ef96ae157223b3309f7703798b32b0b386b2edff Mon Sep 17 00:00:00 2001 From: Byron Jones Date: Tue, 10 Mar 2015 13:07:56 +0800 Subject: Bug 1003701: add the ability for users to prevent review/feedback/needinfo requests --- .../template/en/default/hook/global/header-start.html.tmpl | 4 ++-- .../en/default/hook/global/setting-descs-settings.none.tmpl | 11 +++++++++++ .../en/default/hook/global/user-error-errors.html.tmpl | 5 +++++ 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 extensions/Review/template/en/default/hook/global/setting-descs-settings.none.tmpl (limited to 'extensions/Review/template/en/default/hook/global') diff --git a/extensions/Review/template/en/default/hook/global/header-start.html.tmpl b/extensions/Review/template/en/default/hook/global/header-start.html.tmpl index ff166ac4c..a1ced8108 100644 --- a/extensions/Review/template/en/default/hook/global/header-start.html.tmpl +++ b/extensions/Review/template/en/default/hook/global/header-start.html.tmpl @@ -24,12 +24,12 @@ [% IF bug %] [%# create attachment %] - [% mentors = bug.mentors %] + [% mentors = bug.mentors( exclude_review_blocked => 1 ) %] [% product_obj = bug.product_obj %] [% component_obj = bug.component_obj %] [% ELSIF attachment.bug %] [%# edit attachment %] - [% mentors = attachment.bug.mentors %] + [% mentors = attachment.bug.mentors( exclude_review_blocked => 1 ) %] [% product_obj = attachment.bug.product_obj %] [% component_obj = attachment.bug.component_obj %] [% ELSE %] diff --git a/extensions/Review/template/en/default/hook/global/setting-descs-settings.none.tmpl b/extensions/Review/template/en/default/hook/global/setting-descs-settings.none.tmpl new file mode 100644 index 000000000..f265aed10 --- /dev/null +++ b/extensions/Review/template/en/default/hook/global/setting-descs-settings.none.tmpl @@ -0,0 +1,11 @@ +[%# This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + # + # This Source Code Form is "Incompatible With Secondary Licenses", as + # defined by the Mozilla Public License, v. 2.0. + #%] + +[% + setting_descs.block_reviews = "Block review and feedback requests" +%] diff --git a/extensions/Review/template/en/default/hook/global/user-error-errors.html.tmpl b/extensions/Review/template/en/default/hook/global/user-error-errors.html.tmpl index ca143cca3..4fcd47a68 100644 --- a/extensions/Review/template/en/default/hook/global/user-error-errors.html.tmpl +++ b/extensions/Review/template/en/default/hook/global/user-error-errors.html.tmpl @@ -23,4 +23,9 @@ [% title = "Parameters Required" %] You may not search flag state activity without any search terms. +[% ELSIF error == "reviews_blocked" %] + [% title = "Request Blocked" %] + [% user.identity FILTER html %] is not currently accepting + '[% flagtype FILTER html %]' requests. + [% END %] -- cgit v1.2.3-24-g4f1b