Bug 860723: Custom fields are shown twice in report axis selectors

r/a=LpSolit

diff --git a/query.cgi b/query.cgi
index bfb79e52c97cd00b86b4878c283036b5fe648f67..26c26049d9899da7aeba2a0a204f3ad3959a093d 100755 (executable)
--- a/query.cgi
+++ b/query.cgi
@@ -248,13 +248,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 5e5db06e284148f187667952adb766c30ba4a367..44425898ae5826fcf5738405282639e045fc951b 100644 (file)
--- a/template/en/default/search/search-report-select.html.tmpl
+++ b/template/en/default/search/search-report-select.html.tmpl
@@ -39,12 +39,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 %]