Bug 690873: config.cgi should include keyword descriptions

r/a=LpSolit

diff --git a/config.cgi b/config.cgi
index 891a2f8a36a5359f805e70eda6bbc7dd6021e232..bb6a47349c49d5a933030e4f8b61d3611f844507 100755 (executable)
--- a/config.cgi
+++ b/config.cgi
@@ -44,7 +44,7 @@ $vars->{'priority'}  = get_legal_field_values('priority');
 $vars->{'severity'}  = get_legal_field_values('bug_severity');
 $vars->{'platform'}  = get_legal_field_values('rep_platform');
 $vars->{'op_sys'}    = get_legal_field_values('op_sys');
-$vars->{'keyword'}    = [map($_->name, Bugzilla::Keyword->get_all)];
+$vars->{'keywords'}  = [Bugzilla::Keyword->get_all];
 $vars->{'resolution'} = get_legal_field_values('resolution');
 $vars->{'status'}    = get_legal_field_values('bug_status');
 $vars->{'custom_fields'} =

diff --git a/template/en/default/config.rdf.tmpl b/template/en/default/config.rdf.tmpl
index c6ecac7ce8e1cc5f586b2baca59a9214da53eb7a..afc511054df64c652a8d1f859f72727f6a0cb708 100644 (file)
--- a/template/en/default/config.rdf.tmpl
+++ b/template/en/default/config.rdf.tmpl
@@ -54,13 +54,18 @@
     </Seq>
   </bz:resolution>
 
-  <bz:keyword>
+  <bz:keywords>
     <Seq>
-      [% FOREACH item = keyword %]
-        <li>[% item FILTER html %]</li>
+      [% FOREACH keyword = keywords %]
+        <li>
+          <bz:keyword rdf:about="[% escaped_urlbase %]keyword.cgi?name=[% keyword.name FILTER uri %]">
+            <bz:name>[% keyword.name FILTER html %]</bz:name>
+            <bz:description>[% keyword.description FILTER html %]</bz:description>
+          </bz:keyword>
+        </li>
       [% END %]
     </Seq>
-  </bz:keyword>
+  </bz:keywords>
 
   <bz:platform>
     <Seq>