summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Becker <Frank@Frank-Becker.de>2012-05-27 20:34:12 +0200
committerFrédéric Buclin <LpSolit@gmail.com>2012-05-27 20:34:12 +0200
commit508d532f28ffe84c333cd7b6c2bb13565bd096e5 (patch)
tree34c0fdf246e64276b8c74f43bb75aa2f829e656a
parenta1b2e423700e27df8fe287371bc4c4dd3de7bbe2 (diff)
downloadbugzilla-508d532f28ffe84c333cd7b6c2bb13565bd096e5.tar.gz
bugzilla-508d532f28ffe84c333cd7b6c2bb13565bd096e5.tar.xz
Bug 690873: config.cgi should include keyword descriptions
r/a=LpSolit
-rwxr-xr-xconfig.cgi2
-rw-r--r--template/en/default/config.rdf.tmpl13
2 files changed, 10 insertions, 5 deletions
diff --git a/config.cgi b/config.cgi
index 891a2f8a3..bb6a47349 100755
--- 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 c6ecac7ce..afc511054 100644
--- 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>