Bug 311258: use objects in admin templates (products & co) - Patch by André Batosti <batosti@async.com.br> r=LpSolit a=justdave

8 files changed, 81 insertions, 86 deletions

diff --git a/template/en/default/admin/milestones/confirm-delete.html.tmpl b/template/en/default/admin/milestones/confirm-delete.html.tmpl
index 61601d185..6a7900e72 100644
--- a/template/en/default/admin/milestones/confirm-delete.html.tmpl
+++ b/template/en/default/admin/milestones/confirm-delete.html.tmpl
@@ -21,15 +21,13 @@
   #%]
 
 [%# INTERFACE:
-  # name: string; The name of the milestone
-  #
-  # bug_count: number; The number of bugs targetted at the milestone
-  #
-  # product: string; The name of the product
-  #
+  # product: object; Bugzilla::Product object representing the product to
+  #               which the milestone belongs.
+  # milestone: object; Bugzilla::Milestone object representing the
+  #                    milestone the user wants to delete.
   #%]
 
-[% title = BLOCK %]Delete Milestone of Product '[% product FILTER html %]'
+[% title = BLOCK %]Delete Milestone of Product '[% product.name FILTER html %]'
   [% END %]
 
 [% PROCESS global/header.html.tmpl
@@ -43,20 +41,21 @@
 </tr>
 <tr>
   <td valign="top">Milestone:</td>
-  <td valign="top">[% name FILTER html %]</td>
+  <td valign="top">[% milestone.name FILTER html %]</td>
 </tr>
 <tr>
   <td valign="top">Milestone of Product:</td>
-  <td valign="top">[% product FILTER html %]</td>
+  <td valign="top">[% product.name FILTER html %]</td>
 </tr>
 <tr>
   <td valign="top">[% terms.Bugs %]:</td>
   <td valign="top">
-[% IF bug_count %]
+[% IF milestone.bug_count %]
   <a title="List of [% terms.bugs %] targetted at milestone '
-           [% name FILTER html %]'"
-     href="buglist.cgi?target_milestone=[% name FILTER url_quote %]&amp;product=
-          [%- product FILTER url_quote %]">[% bug_count %]</a>
+           [% milestone.name FILTER html %]'"
+     href="buglist.cgi?target_milestone=[% milestone.name FILTER url_quote %]&amp;product=
+          [%- product.name FILTER url_quote %]">
+          [% milestone.bug_count FILTER none %]</a>
 [% ELSE %]
   None
 [% END %]
@@ -66,13 +65,13 @@
 
 <h2>Confirmation</h2>
   
-[% IF bug_count %]
+[% IF milestone.bug_count %]
 
   <table border="0" cellpadding="20" width="70%" bgcolor="red">
   <tr><td>
     There
-    [% IF bug_count > 1 %] 
-      are [% bug_count %] [%+ terms.bugs %] 
+    [% IF milestone.bug_count > 1 %] 
+      are [% milestone.bug_count FILTER none %] [%+ terms.bugs %] 
     [% ELSE %]
       is 1 [% terms.bug %]
     [% END %]
@@ -89,8 +88,8 @@
 <form method="post" action="editmilestones.cgi">
   <input type="submit" value="Yes, delete">
   <input type="hidden" name="action" value="delete">
-  <input type="hidden" name="product" value="[% product FILTER html %]">
-  <input type="hidden" name="milestone" value="[% name FILTER html %]">
+  <input type="hidden" name="product" value="[% product.name FILTER html %]">
+  <input type="hidden" name="milestone" value="[% milestone.name FILTER html %]">
 </form>
 
 [% PROCESS admin/milestones/footer.html.tmpl %]
diff --git a/template/en/default/admin/milestones/create.html.tmpl b/template/en/default/admin/milestones/create.html.tmpl
index d8779dd54..99a7f833a 100644
--- a/template/en/default/admin/milestones/create.html.tmpl
+++ b/template/en/default/admin/milestones/create.html.tmpl
@@ -20,12 +20,13 @@
   #%]
 
 [%# INTERFACE:
-  # product: string; name of the product the milestone is being created for
+  # product: object; Bugzilla::Product object representing the product to
+  #               which the milestone belongs.
   #%]
   
-[% title = BLOCK %]Add Milestone to Product '[% product FILTER html %]'[% END %]
+[% title = BLOCK %]Add Milestone to Product '[% product.name FILTER html %]'[% END %]
 [% h2 = BLOCK %]This page allows you to add a new milestone to product
-                '[% product FILTER html %]'.[% END %]
+                '[% product.name FILTER html %]'.[% END %]
 [% PROCESS global/header.html.tmpl
   title = title
   h2 = h2
@@ -47,7 +48,7 @@
   </table>
   <input type="submit" value="Add">
   <input type="hidden" name="action" value="new">
-  <input type="hidden" name='product' value="[% product FILTER html %]">
+  <input type="hidden" name='product' value="[% product.name FILTER html %]">
 
 </form>
 
diff --git a/template/en/default/admin/milestones/created.html.tmpl b/template/en/default/admin/milestones/created.html.tmpl
index 87e08cebe..33d2bcba6 100644
--- a/template/en/default/admin/milestones/created.html.tmpl
+++ b/template/en/default/admin/milestones/created.html.tmpl
@@ -20,22 +20,24 @@
   #%]
 
 [%# INTERFACE:
-  # name: string; the name of the newly created milestone
+  # milestone: object; Bugzilla::Milestone object representing the
+  #                    milestone the user created.
   #
-  # product: string; the name of the product the milestone belongs to
+  # product: object; Bugzilla::Product object representing the product to
+  #               which the milestone belongs.
   #%]
   
 [% title = BLOCK %]Adding new Milestone of Product
-                   '[% product FILTER html %]'[% END %]
+                   '[% product.name FILTER html %]'[% END %]
 [% PROCESS global/header.html.tmpl
   title = title
 %]
 
-<p>The milestone '<a title="Edit milestone '[% name FILTER html %]' of 
-   product '[% product FILTER html %]'"
+<p>The milestone '<a title="Edit milestone '[% milestone.name FILTER html %]' of 
+   product '[% product.name FILTER html %]'"
    href="editmilestones.cgi?action=edit&amp;product=
-   [%- product FILTER url_quote %]&amp;milestone=[% name FILTER url_quote %]">
-   [%- name FILTER html %]</a>' has been created.</p>
+   [%- product.name FILTER url_quote %]&amp;milestone=[% milestone.name FILTER url_quote %]">
+   [%- milestone.name FILTER html %]</a>' has been created.</p>
 
 <p>
 
diff --git a/template/en/default/admin/milestones/deleted.html.tmpl b/template/en/default/admin/milestones/deleted.html.tmpl
index 8db9b8943..bddae3136 100644
--- a/template/en/default/admin/milestones/deleted.html.tmpl
+++ b/template/en/default/admin/milestones/deleted.html.tmpl
@@ -21,25 +21,23 @@
   #%]
 
 [%# INTERFACE:
-  # name: string; the name of the deleted milestone.
-  #
-  # product: string; the name of the product the milestone belonged to
-  #
-  # bug_count: number; the number of bugs which were reassigned to
-  #            the default milestone.
+  # product: object; Bugzilla::Product object representing the product to
+  #               which the milestone belongs.
+  # milestone: object; Bugzilla::Milestone object representing the
+  #                    milestone the user deleted.
   #%]
   
-[% title = BLOCK %]Deleted Milestone '[% name FILTER html %]' of Product
-                   '[% product FILTER html %]'[% END %]
+[% title = BLOCK %]Deleted Milestone '[% milestone.name FILTER html %]' of Product
+                   '[% product.name FILTER html %]'[% END %]
 [% PROCESS global/header.html.tmpl
   title = title
 %]
 
 <p>
-[% IF bug_count %]
+[% IF milestone.bug_count %]
 
-  [% bug_count %]
-  [% IF bug_count > 1 %] 
+  [% milestone.bug_count FILTER none %]
+  [% IF milestone.bug_count > 1 %] 
     [%+ terms.bugs %]
   [% ELSE %]
     [%+ terms.bug %]
@@ -51,7 +49,7 @@
 [% END %]
 </p>
 
-<p>Milestone '[% name FILTER html %]' deleted.</p>
+<p>Milestone '[% milestone.name FILTER html %]' deleted.</p>
 
 <p>
 
diff --git a/template/en/default/admin/milestones/edit.html.tmpl b/template/en/default/admin/milestones/edit.html.tmpl
index f49cacf4a..1fdea30e0 100644
--- a/template/en/default/admin/milestones/edit.html.tmpl
+++ b/template/en/default/admin/milestones/edit.html.tmpl
@@ -20,17 +20,16 @@
   #%]
 
 [%# INTERFACE:
-  # name: string; The name of the milestone
-  #
-  # sortkey: number; milestone sortkey
-  #
-  # product: string; The product the milestone belongs to
+  # product: object; Bugzilla::Product object representing the product to
+  #               which the milestone belongs.
+  # milestone: object; Bugzilla::Milestone object representing the
+  #                    milestone the user wants to edit.
   #%]
 
 [% PROCESS global/variables.none.tmpl %]
 
-[% title = BLOCK %]Edit Milestone '[% name FILTER html %]' of product '
-                   [%- product FILTER html %]'[% END %]
+[% title = BLOCK %]Edit Milestone '[% milestone.name FILTER html %]' of product '
+                   [%- product.name FILTER html %]'[% END %]
 [% PROCESS global/header.html.tmpl
   title = title
   onload = "document.forms['f'].milestone.select()"
@@ -42,19 +41,19 @@
     <tr>
       <th valign="top"><label for="milestone">Milestone:</label></th>
       <td><input id="milestone" size="20" maxlength="20" name="milestone" value="
-      [%- name FILTER html %]"></td>
+      [%- milestone.name FILTER html %]"></td>
     </tr>
     <tr>
       <th align="right"><label for="sortkey">Sortkey:</label></th>
       <td><input id="sortkey" size="20" maxlength="20" name="sortkey" value="
-      [%- sortkey FILTER html %]"></td>
+      [%- milestone.sortkey FILTER html %]"></td>
     </tr>
 
   </table>
 
-  <input type="hidden" name="milestoneold" value="[% name FILTER html %]">
+  <input type="hidden" name="milestoneold" value="[% milestone.name FILTER html %]">
   <input type="hidden" name="action" value="update">
-  <input type="hidden" name="product" value="[% product FILTER html %]">
+  <input type="hidden" name="product" value="[% product.name FILTER html %]">
   <input type="submit" value="Update">
 
 </form>
diff --git a/template/en/default/admin/milestones/footer.html.tmpl b/template/en/default/admin/milestones/footer.html.tmpl
index 8980d642e..48a4d950a 100644
--- a/template/en/default/admin/milestones/footer.html.tmpl
+++ b/template/en/default/admin/milestones/footer.html.tmpl
@@ -20,10 +20,11 @@
   #%]
 
 [%# INTERFACE:
-  # name: string; the name of the milestone
+  # product: object; Bugzilla::Product object representing the product to
+  #               which the milestone belongs.
   #
-  # product: string; the name of the product which the milestone
-  #                  belongs/belonged to
+  # milestone: object; Bugzilla::Milestone object representing the
+  #                    milestone.
   #
   # no_XXX_link: boolean; if defined, then don't show the corresponding
   #                       link. Supported parameters are:
@@ -38,29 +39,30 @@
 <hr>
 
 [% UNLESS no_add_milestone_link %]
-  <a title="Add a milestone to product '[% product FILTER html %]'"
+  <a title="Add a milestone to product '[% product.name FILTER html %]'"
      href="editmilestones.cgi?action=add&amp;product=
-          [%- product FILTER url_quote %]">Add</a> a milestone. 
+          [%- product.name FILTER url_quote %]">Add</a> a milestone. 
 [% END %]
 
-[% IF name && !no_edit_milestone_link %]
+[% IF milestone.name && !no_edit_milestone_link %]
   Edit milestone <a 
-  title="Edit Milestone '[% name FILTER html %]' of product '
-         [%- product FILTER html %]'"
+  title="Edit Milestone '[% milestone.name FILTER html %]' of product '
+         [%- product.name FILTER html %]'"
   href="editmilestones.cgi?action=edit&amp;product=
-        [%- product FILTER url_quote %]&amp;milestone=[% name FILTER url_quote %]">
-        '[% name FILTER html %]'</a>.
+        [%- product.name FILTER url_quote %]&amp;milestone=
+        [%- milestone.name FILTER url_quote %]">
+        '[% milestone.name FILTER html %]'</a>.
 [% END %]
 
 [% UNLESS no_edit_other_milestones_link %]
   Edit other milestones of product <a 
   href="editmilestones.cgi?product=
-        [%- product FILTER url_quote %]">'[% product FILTER html %]'</a>.
+        [%- product.name FILTER url_quote %]">'[% product.name FILTER html %]'</a>.
    
 [% END %]
 
   Edit product <a 
   href="editproducts.cgi?action=edit&amp;product=
-        [%- product FILTER url_quote %]">'[% product FILTER html %]'</a>.
+        [%- product.name FILTER url_quote %]">'[% product.name FILTER html %]'</a>.
 
 </p>
diff --git a/template/en/default/admin/milestones/list.html.tmpl b/template/en/default/admin/milestones/list.html.tmpl
index b9311fc1a..d25308583 100644
--- a/template/en/default/admin/milestones/list.html.tmpl
+++ b/template/en/default/admin/milestones/list.html.tmpl
@@ -21,9 +21,9 @@
   #%]
 
 [%# INTERFACE:
-  # milestones: array of milestone objects
+  # product: object; Bugzilla::Product object representing the product to
+  #               which the milestones belongs.
   # showbugcounts: if defined, then bug counts should be included in the table
-  # product: string; the name of the product we are editing milestones for
   #%]
 
 [% USE Bugzilla %]
@@ -32,17 +32,17 @@
 [% PROCESS global/variables.none.tmpl %]
 
 [% title = BLOCK %]Select milestone of product
-                   '[% product FILTER html %]'[% END %]
+                   '[% product.name FILTER html %]'[% END %]
 [% PROCESS global/header.html.tmpl
   title = title
 %]
 
 [% edit_contentlink = BLOCK %]editmilestones.cgi?action=edit&amp;product=
-  [%- product FILTER url_quote %]&amp;milestone=%%name%%[% END %]
+  [%- product.name FILTER url_quote %]&amp;milestone=%%name%%[% END %]
 [% delete_contentlink = BLOCK %]editmilestones.cgi?action=del&amp;product=
-  [%- product FILTER url_quote %]&amp;milestone=%%name%%[% END %]
+  [%- product.name FILTER url_quote %]&amp;milestone=%%name%%[% END %]
 [% bug_count_contentlink = BLOCK %]buglist.cgi?target_milestone=%%name%%&amp;product=
-  [%- product FILTER url_quote %][% END %]
+  [%- product.name FILTER url_quote %][% END %]
 
 
 [% columns = [
@@ -81,7 +81,7 @@
 [%# We want to override the usual 'Delete' link for the default
     milestone %]
 [% overrides.action = [ {
-     match_value => "$default_milestone"
+     match_value => product.default_milestone
      match_field => 'name'
      override_content => 1
      content => "(Default milestone)"
@@ -92,7 +92,7 @@
 
 [% PROCESS admin/table.html.tmpl
      columns = columns
-     data = milestones
+     data = product.milestones
      overrides = overrides
 %]
 
@@ -100,7 +100,7 @@
 
 [% IF ! showbugcounts %]
 
-  <p><a href="editmilestones.cgi?product=[% product FILTER url_quote %]&amp;showbugcounts=1">
+  <p><a href="editmilestones.cgi?product=[% product.name FILTER url_quote %]&amp;showbugcounts=1">
       Redisplay table with [% terms.bug %] counts (slower)</a></p>
 
 [% END %]
diff --git a/template/en/default/admin/milestones/updated.html.tmpl b/template/en/default/admin/milestones/updated.html.tmpl
index bfc09e210..4208e8d79 100644
--- a/template/en/default/admin/milestones/updated.html.tmpl
+++ b/template/en/default/admin/milestones/updated.html.tmpl
@@ -20,35 +20,29 @@
   #%]
 
 [%# INTERFACE:
+  # product: object; Bugzilla::Product object representing the product to
+  #               which the milestone belongs.
   #
   # 'updated_XXX' variables are booleans, and are defined if the
   # 'XXX' field was updated during the edit just being handled.
-  # Variables called just 'XXX' are strings, and are the _new_ contents
-  # of the fields.
-  #
-  # name & updated_name: the name of the milestone
-  #
-  # sortkey & updated_sortkey: the milestone sortkey
-  #
-  # product: string; the name of the product the milestone belongs to
   #%]
   
-[% title = BLOCK %]Updating Milestone '[% name FILTER html %]' of Product
-                   '[% product FILTER html %]'[% END %]
+[% title = BLOCK %]Updating Milestone '[% milestone.name FILTER html %]' of Product
+                   '[% product.name FILTER html %]'[% END %]
 [% PROCESS global/header.html.tmpl
   title = title
 %]
 
 [% IF updated_name %]
-  <p>Updated Milestone name to: '[% name FILTER html %]'.</p>
+  <p>Updated Milestone name to: '[% milestone.name FILTER html %]'.</p>
 [% END %]
 
 [% IF updated_sortkey %]
-  <p>Updated Milestone sortkey to: '[% sortkey FILTER html %]'.</p>
+  <p>Updated Milestone sortkey to: '[% milestone.sortkey FILTER html %]'.</p>
 [% END %]
 
 [% UNLESS updated_sortkey || updated_name %]
-  <p>Nothing changed for milestone '[% name FILTER html %]'.
+  <p>Nothing changed for milestone '[% milestone.name FILTER html %]'.
 [% END %]
    
 <p>