summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPami Ketolainen <pami.ketolainen@gmail.com>2013-04-11 15:16:20 +0200
committerFrédéric Buclin <LpSolit@gmail.com>2013-04-11 15:16:20 +0200
commit294cff651d72e07b573651bffea4c3c7acf3934a (patch)
tree868587872d1cf451e568c2c2a3f7e528f87cd4a8
parent28452a3f403a2f7a8dde0dff8c60492fdbbb31f3 (diff)
downloadbugzilla-294cff651d72e07b573651bffea4c3c7acf3934a.tar.gz
bugzilla-294cff651d72e07b573651bffea4c3c7acf3934a.tar.xz
Bug 860723: Custom fields are shown twice in report axis selectors
r/a=LpSolit
-rwxr-xr-xquery.cgi7
-rw-r--r--template/en/default/search/search-report-select.html.tmpl7
2 files changed, 0 insertions, 14 deletions
diff --git a/query.cgi b/query.cgi
index 9c53e2151..0e921ac0c 100755
--- a/query.cgi
+++ b/query.cgi
@@ -261,13 +261,6 @@ if (($cgi->param('query_format') || $cgi->param('format') || "")
$vars->{'category'} = Bugzilla::Chart::getVisibleSeries();
}
-if ($cgi->param('format') && $cgi->param('format') =~ /^report-(table|graph)$/) {
- # Get legal custom fields for tabular and graphical reports.
- my @custom_fields_for_reports =
- grep { $_->type == FIELD_TYPE_SINGLE_SELECT } Bugzilla->active_custom_fields;
- $vars->{'custom_fields'} = \@custom_fields_for_reports;
-}
-
$vars->{'known_name'} = $cgi->param('known_name');
$vars->{'columnlist'} = $cgi->param('columnlist');
diff --git a/template/en/default/search/search-report-select.html.tmpl b/template/en/default/search/search-report-select.html.tmpl
index d806e2d03..93b4c44f8 100644
--- a/template/en/default/search/search-report-select.html.tmpl
+++ b/template/en/default/search/search-report-select.html.tmpl
@@ -25,12 +25,5 @@
[% " selected" IF default.$name.0 == field %]>
[% field_descs.$field || field FILTER html %]</option>
[% END %]
-
- [%# Single-select fields are also valid column names. %]
- [% FOREACH field = custom_fields %]
- <option value="[% field.name FILTER html %]"
- [% " selected" IF default.$name.0 == field.name %]>
- [% field.description FILTER html %]</option>
- [% END %]
</select>
[% END %]