Commit f1099078 authored by Byron Jones's avatar Byron Jones

Bug 850986: don't allow setting a flag's requestee to a disabled account

r=dkl, a=justdave
parent ca9d0d91
......@@ -668,9 +668,14 @@ sub _check_requestee {
# is specifically requestable. For existing flags, if the requestee
# was set before the flag became specifically unrequestable, the
# user can either remove him or leave him alone.
ThrowUserError('flag_requestee_disabled', { type => $self->type })
ThrowUserError('flag_type_requestee_disabled', { type => $self->type })
if !$self->type->is_requesteeble;
# You can't ask a disabled account, as they don't have the ability to
# set the flag.
ThrowUserError('flag_requestee_disabled', { requestee => $requestee })
if !$requestee->is_enabled;
# Make sure the requestee can see the bug.
# Note that can_see_bug() will query the DB, so if the bug
# is being added/removed from some groups and these changes
......
......@@ -633,10 +633,15 @@
<br>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" %]
[% ELSIF error == "flag_type_requestee_disabled" %]
[% title = "Flag not Requestable from Specific Person" %]
You can't ask a specific person for <em>[% type.name FILTER html %]</em>.
[% ELSIF error == "flag_requestee_disabled" %]
[% title = "Flag Requestee Disabled" %]
You can't ask <em>[% requestee.identity FILTER html %]</em> 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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment