Bug 431363: Include information about flag types when config.cgi returns data in...

diff --git a/template/en/default/config.rdf.tmpl b/template/en/default/config.rdf.tmpl
index 8d2c5a282dc8a6037ab8e7ea73d2eec268e12539..3c6f5496932b6f5c7831f9ad750df5eb6a241737 100644 (file)
--- a/template/en/default/config.rdf.tmpl
+++ b/template/en/default/config.rdf.tmpl
@@ -16,6 +16,7 @@
   # Rights Reserved.
   #
   # Contributor(s): Myk Melez <myk@mozilla.org>
+  #                 Frédéric Buclin <LpSolit@gmail.com>
   #%]
 
 <?xml version="1.0"[% IF Param('utf8') %] encoding="UTF-8"[% END %]?>
@@ -123,7 +124,8 @@
             <bz:components>
               <Seq>
                 [% FOREACH component = product.components %]
-                  <li resource="[% urlbase FILTER xml %]component.cgi?name=[% component.name FILTER url_quote %]"/>
+                  <li resource="[% urlbase FILTER xml %]component.cgi?name=[% component.name FILTER url_quote 
+                      %]&amp;product=[% product.name FILTER url_quote %]"/>
                 [% END %]
               </Seq>
             </bz:components>
@@ -152,13 +154,26 @@
     </Seq>
   </bz:products>
 
+  [% all_visible_flag_types = {} %]
   <bz:components>
     <Seq>
       [% FOREACH product = products %]
         [% FOREACH component = product.components %]
           <li>
-            <bz:component rdf:about="[% urlbase FILTER xml %]component.cgi?name=[% component.name FILTER url_quote %]">
+            <bz:component rdf:about="[% urlbase FILTER xml %]component.cgi?name=[% component.name FILTER url_quote 
+                          %]&amp;product=[% product.name FILTER url_quote %]">
               <bz:name>[% component.name FILTER html %]</bz:name>
+              <bz:flag_types>
+                <Seq>
+                  [% flag_types = component.flag_types.bug.merge(component.flag_types.attachment) %]
+                  [% FOREACH flag_type = flag_types %]
+                    [% NEXT UNLESS flag_type.is_active %]
+                    [% all_visible_flag_types.${flag_type.id} = flag_type %]
+                    <li resource="[% urlbase FILTER xml %]flags.cgi?id=[% flag_type.id FILTER url_quote
+                        %]&amp;name=[% flag_type.name FILTER url_quote %]" />
+                  [% END %]
+                </Seq>
+              </bz:flag_types>
             </bz:component>
           </li>
         [% END %]
@@ -196,6 +211,24 @@
     </bz:target_milestones>
   [% END %]
 
+  <bz:flag_types>
+    <Seq>
+      [% FOREACH flag_type = all_visible_flag_types.values.sort('name') %]
+        <li>
+          <bz:flag_type rdf:about="[% urlbase FILTER xml %]flag.cgi?id=[% flag_type.id FILTER url_quote
+                        %]&amp;name=[% flag_type.name FILTER url_quote %]">
+            <bz:name>[% flag_type.name FILTER html %]</bz:name>
+            <bz:description>[% flag_type.description FILTER html %]</bz:description>
+            <bz:type>[% flag_type.target_type FILTER html %]</bz:type>
+            <bz:requestable>[% flag_type.is_requestable FILTER html %]</bz:requestable>
+            <bz:specifically_requestable>[% flag_type.is_requesteeble FILTER html %]</bz:specifically_requestable>
+            <bz:multiplicable>[% flag_type.is_multiplicable FILTER html %]</bz:multiplicable>
+          </bz:flag_type>
+        </li>
+      [% END %]
+    </Seq>
+  </bz:flag_types>
+
   <bz:fields>
     <Seq>
       [% PROCESS "global/field-descs.none.tmpl" %]