Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for bug 291391: allows users to rerequest set flags even if they don't have the privilege to set them; r=lpsolit; a=myk

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@172591 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
myk%mozilla.org
2005-04-22 02:17:14 +00:00
parent cc4f3cc44e
commit d6312ffd28
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/webtools/bugzilla/Bugzilla/Flag.pm
View File

@@ -320,9 +320,9 @@ sub validate {
# - The flag is unchanged
next if ($status eq $flag->{status});
# - User in the $request_gid group can clear pending requests
next if ($status eq 'X'
&& $flag->{status} eq '?'
# - User in the $request_gid group can clear pending requests and set flags
# and can rerequest set flags.
next if (($status eq 'X' || $status eq '?')
&& (!$flag->{type}->{request_gid}
|| $user->in_group(&::GroupIdToName($flag->{type}->{request_gid}))));

10
mozilla/webtools/bugzilla/template/en/default/global/user-error.html.tmpl
View File

@@ -442,12 +442,10 @@
[% title = "Flag Modification Denied" %]
You tried to [% IF status == "+" %] grant [% ELSIF status == "-" %] deny
[% ELSIF status == "X" %] clear [% ELSE %] request [% END %]
<code>[% name FILTER html %]</code>
[% IF status == "?" && old_status != "X" %], but this flag is already
set[% END %].
Only a sufficiently empowered user [% IF status == "X" %] or the user who
set <code>[% name FILTER html %][% old_status FILTER html %]</code> in
the first place [% END %] can make this change.
<code>[% name FILTER html %]
[% IF status == "X" %][% old_status FILTER html %][% END %]</code>.
Only a sufficiently empowered user can make this change.
[% ELSIF error == "format_not_found" %]
[% title = "Format Not Found" %]