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

8 files changed, 78 insertions, 77 deletions

diff --git a/template/en/default/admin/versions/confirm-delete.html.tmpl b/template/en/default/admin/versions/confirm-delete.html.tmpl
index 34ada607b..a3e8f8d62 100644
--- a/template/en/default/admin/versions/confirm-delete.html.tmpl
+++ b/template/en/default/admin/versions/confirm-delete.html.tmpl
@@ -21,15 +21,13 @@
   #%]
 
 [%# INTERFACE:
-  # name: string; The name of the version
-  #
-  # bug_count: number; The number of bugs targetted at the version
-  #
-  # product: string; The name of the product
-  #
+  # product: object; Bugzilla::Product object representing the product to
+  #               which the version belongs.
+  # version: object; Bugzilla::Version object representing the
+  #                    version the user wants to delete.
   #%]
 
-[% title = BLOCK %]Delete Version of Product '[% product FILTER html %]'
+[% title = BLOCK %]Delete Version of Product '[% product.name FILTER html %]'
   [% END %]
 
 [% PROCESS global/header.html.tmpl
@@ -43,20 +41,21 @@
 </tr>
 <tr>
   <td valign="top">Version:</td>
-  <td valign="top">[% name FILTER html %]</td>
+  <td valign="top">[% version.name FILTER html %]</td>
 </tr>
 <tr>
   <td valign="top">Version 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 version.bug_count %]
   <a title="List of [% terms.bugs %] targetted at version '
-           [% name FILTER html %]'"
-     href="buglist.cgi?version=[% name FILTER url_quote %]&amp;product=
-          [%- product FILTER url_quote %]">[% bug_count %]</a>
+           [%- version.name FILTER html %]'"
+     href="buglist.cgi?version=[% version.name FILTER url_quote %]&amp;product=
+          [%- product.name FILTER url_quote %]">
+          [%- version.bug_count FILTER none %]</a>
 [% ELSE %]
   None
 [% END %]
@@ -66,18 +65,18 @@
 
 <h2>Confirmation</h2>
   
-[% IF bug_count %]
+[% IF version.bug_count %]
 
   Sorry, there
-  [% IF bug_count > 1 %] 
-    are [% bug_count %] [%+ terms.bugs %] 
+  [% IF version.bug_count > 1 %] 
+    are [% version.bug_count FILTER none %] [%+ terms.bugs %] 
   [% ELSE %]
-    is [% bug_count %] [%+ terms.bug %] 
+    is [% version.bug_count FILTER none %] [%+ terms.bug %] 
   [% END %]
 
   outstanding for this version. You must move 
 
-  [% IF bug_count > 1 %]
+  [% IF version.bug_count > 1 %]
      those [% terms.bugs %] 
   [% ELSE %]
      that [% terms.bug %]
@@ -91,8 +90,8 @@
   <form method="post" action="editversions.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="version" value="[% name FILTER html %]">
+    <input type="hidden" name="product" value="[% product.name FILTER html %]">
+    <input type="hidden" name="version" value="[% version.name FILTER html %]">
   </form>
 
 [% END %]
diff --git a/template/en/default/admin/versions/create.html.tmpl b/template/en/default/admin/versions/create.html.tmpl
index 594bf4f87..614996300 100644
--- a/template/en/default/admin/versions/create.html.tmpl
+++ b/template/en/default/admin/versions/create.html.tmpl
@@ -20,12 +20,13 @@
   #%]
 
 [%# INTERFACE:
-  # product: string; name of the product the version is being created for
+  # product: object; Bugzilla::Product object representing the product to
+  #               which the version is being created for
   #%]
   
-[% title = BLOCK %]Add Version to Product '[% product FILTER html %]'[% END %]
+[% title = BLOCK %]Add Version to Product '[% product.name FILTER html %]'[% END %]
 [% h2 = BLOCK %]This page allows you to add a new version to product
-                '[% product FILTER html %]'.[% END %]
+                '[% product.name FILTER html %]'.[% END %]
 [% PROCESS global/header.html.tmpl
   title = title
   h2 = h2
@@ -41,7 +42,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/versions/created.html.tmpl b/template/en/default/admin/versions/created.html.tmpl
index 84445cccd..597ac119f 100644
--- a/template/en/default/admin/versions/created.html.tmpl
+++ b/template/en/default/admin/versions/created.html.tmpl
@@ -20,22 +20,23 @@
   #%]
 
 [%# INTERFACE:
-  # name: string; the name of the newly created version
-  #
-  # product: string; the name of the product the version belongs to
+  # product: object; Bugzilla::Product object representing the product to
+  #                  which the version belongs.
+  # version: object; Bugzilla::Version object representing the
+  #                  newly created version
   #%]
   
 [% title = BLOCK %]Adding new Version of Product
-                   '[% product FILTER html %]'[% END %]
+                   '[% product.name FILTER html %]'[% END %]
 [% PROCESS global/header.html.tmpl
   title = title
 %]
 
-<p>The version '<a title="Edit version '[% name FILTER html %]' of product '
-   [%- product FILTER html %]'"
+<p>The version '<a title="Edit version '[% version.name FILTER html %]' of product '
+   [%- product.name FILTER html %]'"
    href="editversions.cgi?action=edit&amp;product=
-   [%- product FILTER url_quote %]&amp;version=[% name FILTER url_quote %]">
-   [%- name FILTER html %]</a>' has been created.</p>
+   [%- product.name FILTER url_quote %]&amp;version=[% version.name FILTER url_quote %]">
+   [%- version.name FILTER html %]</a>' has been created.</p>
 
 <p>
 
diff --git a/template/en/default/admin/versions/deleted.html.tmpl b/template/en/default/admin/versions/deleted.html.tmpl
index 2ec3ebe10..ab75d0a5b 100644
--- a/template/en/default/admin/versions/deleted.html.tmpl
+++ b/template/en/default/admin/versions/deleted.html.tmpl
@@ -20,19 +20,19 @@
   #%]
 
 [%# INTERFACE:
-  # name: string; the name of the deleted version.
-  #
-  # product: string; the name of the product the version belonged to
-  #
+  # product: object; Bugzilla::Product object representing the product to
+  #               which the version belongs.
+  # version: object; Bugzilla::Version object representing the
+  #                    version the user deleted.
   #%]
   
-[% title = BLOCK %]Deleted Version '[% name FILTER html %]' of Product
-                   '[% product FILTER html %]'[% END %]
+[% title = BLOCK %]Deleted Version '[% version.name FILTER html %]' of Product
+                   '[% product.name FILTER html %]'[% END %]
 [% PROCESS global/header.html.tmpl
   title = title
 %]
 
-<p>Version '[% name FILTER html %]' deleted.</p>
+<p>Version '[% version.name FILTER html %]' deleted.</p>
 
 <p>
 
diff --git a/template/en/default/admin/versions/edit.html.tmpl b/template/en/default/admin/versions/edit.html.tmpl
index ef1fbd270..eff3d92ad 100644
--- a/template/en/default/admin/versions/edit.html.tmpl
+++ b/template/en/default/admin/versions/edit.html.tmpl
@@ -20,15 +20,16 @@
   #%]
 
 [%# INTERFACE:
-  # name: string; The name of the version
-  #
-  # product: string; The product the version belongs to
+  # product: object; Bugzilla::Product object representing the product to
+  #               which the version belongs.
+  # version: object; Bugzilla::Version object representing the
+  #                    version the user wants to edit.
   #%]
 
 [% PROCESS global/variables.none.tmpl %]
 
-[% title = BLOCK %]Edit Version '[% name FILTER html %]' of product '
-                   [%- product FILTER html %]'[% END %]
+[% title = BLOCK %]Edit Version '[% version.name FILTER html %]' of product '
+                   [%- product.name FILTER html %]'[% END %]
 [% PROCESS global/header.html.tmpl
   title = title
 %]
@@ -39,14 +40,14 @@
     <tr>
       <th valign="top"><label for="version">Version:</label></th>
       <td><input id="version" size="64" maxlength="64" name="version" value="
-      [%- name FILTER html %]"></td>
+      [%- version.name FILTER html %]"></td>
     </tr>
 
   </table>
 
-  <input type="hidden" name="versionold" value="[% name FILTER html %]">
+  <input type="hidden" name="versionold" value="[% version.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/versions/footer.html.tmpl b/template/en/default/admin/versions/footer.html.tmpl
index 252005697..cf5e16ddd 100644
--- a/template/en/default/admin/versions/footer.html.tmpl
+++ b/template/en/default/admin/versions/footer.html.tmpl
@@ -20,10 +20,9 @@
   #%]
 
 [%# INTERFACE:
-  # name: string; the name of the version
-  #
-  # product: string; the name of the product which the version
-  #                  belongs/belonged to
+  # product: object; Bugzilla::Product object representing the product to
+  #               which the version belongs.
+  # version: object; Bugzilla::Version object representing the version
   #
   # no_XXX_link: boolean; if defined, then don't show the corresponding
   #                       link. Supported parameters are:
@@ -38,29 +37,30 @@
 <hr>
 
 [% UNLESS no_add_version_link %]
-  <a title="Add a version to product '[% product FILTER html %]'"
+  <a title="Add a version to product '[% product.name FILTER html %]'"
      href="editversions.cgi?action=add&amp;product=
-          [%- product FILTER url_quote %]">Add</a> a version. 
+          [%- product.name FILTER url_quote %]">Add</a> a version. 
 [% END %]
 
-[% IF name && !no_edit_version_link %]
+[% IF version.name && !no_edit_version_link %]
   Edit version <a 
-  title="Edit Version '[% name FILTER html %]' of product '
-         [%- product FILTER html %]'"
+  title="Edit Version '[% version.name FILTER html %]' of product '
+         [%- product.name FILTER html %]'"
   href="editversions.cgi?action=edit&amp;product=
-        [%- product FILTER url_quote %]&amp;version=[% name FILTER url_quote %]">
-        '[% name FILTER html %]'</a>.
+        [%- product.name FILTER url_quote %]&amp;version=
+        [%- version.name FILTER url_quote %]">
+        '[% version.name FILTER html %]'</a>.
 [% END %]
 
 [% UNLESS no_edit_other_versions_link %]
   Edit other versions of product <a 
   href="editversions.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/versions/list.html.tmpl b/template/en/default/admin/versions/list.html.tmpl
index b2ed2c343..5102dd506 100644
--- a/template/en/default/admin/versions/list.html.tmpl
+++ b/template/en/default/admin/versions/list.html.tmpl
@@ -21,25 +21,24 @@
   #%]
 
 [%# INTERFACE:
-  # versions: array of version objects
-  # showbugcounts: if defined, then bug counts should be included in the table
-  # product: string; the name of the product we are editing versions for
+  # product: object; Bugzilla::Product object representing the product to
+  #               which the versions belongs.
   #%]
 
 [% PROCESS global/variables.none.tmpl %]
 
 [% title = BLOCK %]Select version of product
-                   '[% product FILTER html %]'[% END %]
+                   '[% product.name FILTER html %]'[% END %]
 [% PROCESS global/header.html.tmpl
   title = title
 %]
 
 [% edit_contentlink = BLOCK %]editversions.cgi?action=edit&amp;product=
-  [%- product FILTER url_quote %]&amp;version=%%name%%[% END %]
+  [%- product.name FILTER url_quote %]&amp;version=%%name%%[% END %]
 [% delete_contentlink = BLOCK %]editversions.cgi?action=del&amp;product=
-  [%- product FILTER url_quote %]&amp;version=%%name%%[% END %]
+  [%- product.name FILTER url_quote %]&amp;version=%%name%%[% END %]
 [% bug_count_contentlink = BLOCK %]buglist.cgi?version=%%name%%&amp;product=
-  [%- product FILTER url_quote %][% END %]
+  [%- product.name FILTER url_quote %][% END %]
 
 
 [% columns = [
@@ -72,14 +71,14 @@
 
 [% PROCESS admin/table.html.tmpl
      columns = columns
-     data = versions
+     data = product.versions
 %]
 
 <p>
 
 [% IF ! showbugcounts %]
 
-  <p><a href="editversions.cgi?product=[% product FILTER url_quote %]&amp;showbugcounts=1">
+  <p><a href="editversions.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/versions/updated.html.tmpl b/template/en/default/admin/versions/updated.html.tmpl
index 04851adae..5bae6bcf6 100644
--- a/template/en/default/admin/versions/updated.html.tmpl
+++ b/template/en/default/admin/versions/updated.html.tmpl
@@ -20,26 +20,26 @@
   #%]
 
 [%# INTERFACE:
+  # product: object; Bugzilla::Product object representing the product to
+  #               which the version belongs.
+  # version: object; Bugzilla::Version object representing the
+  #                    version the user updated.
   #
   # updated_name: boolean; defined if the 'name' field was updated
-  #
-  # name: string; the new name of the version
-  #
-  # product: string; the name of the product the version belongs to
   #%]
   
-[% title = BLOCK %]Updating Version '[% name FILTER html %]' of Product
-                   '[% product FILTER html %]'[% END %]
+[% title = BLOCK %]Updating Version '[% version.name FILTER html %]' of Product
+                   '[% product.name FILTER html %]'[% END %]
 [% PROCESS global/header.html.tmpl
   title = title
 %]
 
 [% IF updated_name %]
-  <p>Updated Version name to: '[% name FILTER html %]'.</p>
+  <p>Updated Version name to: '[% version.name FILTER html %]'.</p>
 [% END %]
 
 [% UNLESS updated_name %]
-  <p>Nothing changed for version '[% name FILTER html %]'.
+  <p>Nothing changed for version '[% version.name FILTER html %]'.
 [% END %]
    
 <p>