diff options
| author | Byron Jones <bjones@mozilla.com> | 2013-02-19 06:50:58 +0100 |
|---|---|---|
| committer | Byron Jones <bjones@mozilla.com> | 2013-02-19 06:50:58 +0100 |
| commit | ce7169dc8be336da570202e818033a7098012e83 (patch) | |
| tree | 18110fb4d7624d6701120a52529938948ebe5235 | |
| parent | af17848d5a0395fffa6db2d83d682407a5a4fcb5 (diff) | |
| download | bugzilla-ce7169dc8be336da570202e818033a7098012e83.tar.gz bugzilla-ce7169dc8be336da570202e818033a7098012e83.tar.xz | |
Bug 824399
| -rw-r--r-- | Bugzilla/Config/GroupSecurity.pm | 8 | ||||
| -rwxr-xr-x | buglist.cgi | 5 | ||||
| -rwxr-xr-x | report.cgi | 8 | ||||
| -rw-r--r-- | template/en/default/admin/params/groupsecurity.html.tmpl | 3 |
4 files changed, 22 insertions, 2 deletions
diff --git a/Bugzilla/Config/GroupSecurity.pm b/Bugzilla/Config/GroupSecurity.pm index f7f717379..6296583d9 100644 --- a/Bugzilla/Config/GroupSecurity.pm +++ b/Bugzilla/Config/GroupSecurity.pm @@ -81,6 +81,14 @@ sub get_param_list { }, { + name => 'debug_group', + type => 's', + choices => \&_get_all_group_names, + default => 'admin', + checker => \&check_group + }, + + { name => 'usevisibilitygroups', type => 'b', default => 0 diff --git a/buglist.cgi b/buglist.cgi index e3c56cd24..517aa4507 100755 --- a/buglist.cgi +++ b/buglist.cgi @@ -787,7 +787,10 @@ $params->delete('limit') if $vars->{'default_limited'}; # Query Execution ################################################################################ -if ($cgi->param('debug')) { +if ($cgi->param('debug') + && Bugzilla->params->{debug_group} + && $user->in_group(Bugzilla->params->{debug_group}) +) { $vars->{'debug'} = 1; $vars->{'query'} = $query; # Explains are limited to admins because you could use them to figure diff --git a/report.cgi b/report.cgi index 5d5033b7d..7bff62be9 100755 --- a/report.cgi +++ b/report.cgi @@ -226,7 +226,13 @@ $vars->{'width'} = $width if $width; $vars->{'height'} = $height if $height; $vars->{'query'} = $query; -$vars->{'debug'} = $cgi->param('debug'); + +if ($cgi->param('debug') + && Bugzilla->params->{debug_group} + && Bugzilla->user->in_group(Bugzilla->params->{debug_group}) +) { + $vars->{'debug'} = 1; +} if ($action eq "wrap") { # So which template are we using? If action is "wrap", we will be using diff --git a/template/en/default/admin/params/groupsecurity.html.tmpl b/template/en/default/admin/params/groupsecurity.html.tmpl index ab39a9149..783099a11 100644 --- a/template/en/default/admin/params/groupsecurity.html.tmpl +++ b/template/en/default/admin/params/groupsecurity.html.tmpl @@ -42,6 +42,9 @@ querysharegroup => "The name of the group of users who can share their " _ "saved searches with others.", + debug_group => "The name of the group of users who can view the actual " _ + "SQL query generated when viewing $terms.bug lists and reports.", + usevisibilitygroups => "Do you wish to restrict visibility of users to members of " _ "specific groups?", |