From b09e5ff2dd0b97a0254e922183abd79025c2e69a Mon Sep 17 00:00:00 2001 From: Byron Jones Date: Tue, 26 Mar 2013 23:26:41 +0800 Subject: Bug 854901: don't allow setting a flag's requestee to a disabled account --- template/en/default/global/code-error.html.tmpl | 2 +- template/en/default/global/user-error.html.tmpl | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'template/en') diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl index ffb39c160..704d3ad16 100644 --- a/template/en/default/global/code-error.html.tmpl +++ b/template/en/default/global/code-error.html.tmpl @@ -262,7 +262,7 @@ Flags cannot be set for objects of type [% caller FILTER html %]. They can only be set for [% terms.bugs %] and attachments. - [% ELSIF error == "flag_requestee_disabled" %] + [% ELSIF error == "flag_type_requestee_disabled" %] [% title = "Flag not Requestable from Specific Person" %] You can't ask a specific person for [% type.name FILTER html %]. diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index 2ec81a6f6..6c1caf81d 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -621,6 +621,11 @@
Alternately, if your attachment is an image, you could convert it to a compressible format like JPG or PNG and try again. + [% ELSIF error == "flag_requestee_disabled" %] + [% title = "Flag Requestee Disabled" %] + You can't ask [% requestee.identity FILTER html %] because that + account is disabled. + [% ELSIF error == "flag_requestee_needs_privs" %] [% title = "Flag Requestee Needs Privileges" %] [% requestee.identity FILTER html %] does not have permission to set the -- cgit v1.2.3-24-g4f1b