Bug 374981: Custom field single select options not available in config.cgi rdf -...

diff --git a/config.cgi b/config.cgi
index c320ae5156c9d758b41079987e33c6d4dc90af28..57c5842cf1ae9e7dc7d61d529afbb44a55355b57 100755 (executable)
--- a/config.cgi
+++ b/config.cgi
@@ -55,6 +55,8 @@ $vars->{'op_sys'}    = get_legal_field_values('op_sys');
 $vars->{'keyword'}    = [map($_->name, Bugzilla::Keyword->get_all)];
 $vars->{'resolution'} = get_legal_field_values('resolution');
 $vars->{'status'}    = get_legal_field_values('bug_status');
+$vars->{'custom_fields'} =
+  [Bugzilla->get_fields({custom => 1, obsolete => 0, type => FIELD_TYPE_SINGLE_SELECT})];
 
 # Include a list of product objects.
 if ($cgi->param('product')) {

diff --git a/template/en/default/config.js.tmpl b/template/en/default/config.js.tmpl
index 2427c8748a6733926919cf218d9ce385813f37d0..9c66cad9c91ff163c20898f3315243f0aeb4e0ae 100644 (file)
--- a/template/en/default/config.js.tmpl
+++ b/template/en/default/config.js.tmpl
@@ -58,6 +58,14 @@ var platform      = [ [% FOREACH x = platform %]'[% x FILTER js %]', [% END %] ]
 var severity      = [ [% FOREACH x = severity %]'[% x FILTER js %]', [% END %] ];
 
 
+// Custom Fields
+// =============
+
+[% FOREACH cf = custom_fields %]
+var [% cf.name FILTER js %] = [ [% FOREACH x = cf.legal_values %]'[% x FILTER js %]', [% END %] ];
+[% END %]
+
+
 // Products and Components
 // =======================
 //

diff --git a/template/en/default/config.rdf.tmpl b/template/en/default/config.rdf.tmpl
index 32e94cbcace15ed3f2a608b37797530e7e3e4056..cd9a27ded091d2e3d9cd15af5bc4870b39027804 100644 (file)
--- a/template/en/default/config.rdf.tmpl
+++ b/template/en/default/config.rdf.tmpl
@@ -103,6 +103,17 @@
     </Seq>
   </bz:severity>
 
+[% FOREACH cf = custom_fields %]
+  <bz:[% cf.name FILTER html %]>
+    <Seq>
+      [% FOREACH item = cf.legal_values %]
+        <li>[% item FILTER html %]</li>
+      [% END %]
+    </Seq>
+  </bz:[% cf.name FILTER html %]>
+
+[% END %]
+
   <bz:products>
     <Seq>
       [% FOREACH product = products %]